diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b6ba0ea8..4f5aae1d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
### Added
- Document HTTP/2 support ([#330](https://github.com/opensearch-project/opensearch-java/pull/330))
- Add support for phase_took & search_pipeline request params ([#1036](https://github.com/opensearch-project/opensearch-java/pull/1036))
-- Add a serializer method for classes implementing JsonpSerializable.([#1064](https://github.com/opensearch-project/opensearch-java/pull/1064))
+- Add an interface PlainJsonSerializable inherit from JsonpSerializable with a default method streamlining serialization ([#1064](https://github.com/opensearch-project/opensearch-java/pull/1064))
### Dependencies
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
index 2de1706223..fe6603175b 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java
@@ -43,9 +43,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -54,7 +54,7 @@
@JsonpDeserializable
@Generated("org.opensearch.client.codegen.CodeGenerator")
-public class OpenSearchVersionInfo implements JsonpSerializable {
+public class OpenSearchVersionInfo implements PlainJsonSerializable {
private final String buildDate;
diff --git a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
index a8afc4e71d..a86ca92138 100644
--- a/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
+++ b/java-client/src/generated/java/org/opensearch/client/opensearch/core/InfoResponse.java
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.OpenSearchVersionInfo;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -54,7 +54,7 @@
@JsonpDeserializable
@Generated("org.opensearch.client.codegen.CodeGenerator")
-public class InfoResponse implements JsonpSerializable {
+public class InfoResponse implements PlainJsonSerializable {
private final String clusterName;
diff --git a/java-client/src/main/java/org/opensearch/client/json/JsonpSerializable.java b/java-client/src/main/java/org/opensearch/client/json/JsonpSerializable.java
index f7d74a2a35..0b4d9b5290 100644
--- a/java-client/src/main/java/org/opensearch/client/json/JsonpSerializable.java
+++ b/java-client/src/main/java/org/opensearch/client/json/JsonpSerializable.java
@@ -33,9 +33,6 @@
package org.opensearch.client.json;
import jakarta.json.stream.JsonGenerator;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.UncheckedIOException;
/**
* An object that is its own JsonP serializer
@@ -43,24 +40,4 @@
public interface JsonpSerializable {
void serialize(JsonGenerator generator, JsonpMapper mapper);
-
- /**
- * A default method which returns string representation for the instances of classes
- * implementing JsonpSerializable interface.
- * Usage : Eg for SearchRequest.class
{@code SearchRequest implements JsonpSerializable{..}
- * SearchRequest searchRequest = SearchRequest.of(request -> request...);
- * String searchRequestString = searchRequest.writeValueAsString();}
- *
- */
- default String toJsonString() {
- try (StringWriter writer = new StringWriter()) {
- try (JsonGenerator generator = JsonpUtils.DEFAULT_PROVIDER.createGenerator(writer)) {
- serialize(generator, JsonpUtils.DEFAULT_JSONP_MAPPER);
- }
- return writer.toString();
- } catch (IOException ex) {
- throw new UncheckedIOException(ex);
- }
- }
-
}
diff --git a/java-client/src/main/java/org/opensearch/client/json/JsonpUtils.java b/java-client/src/main/java/org/opensearch/client/json/JsonpUtils.java
index fc492a72c5..d9cfdaf306 100644
--- a/java-client/src/main/java/org/opensearch/client/json/JsonpUtils.java
+++ b/java-client/src/main/java/org/opensearch/client/json/JsonpUtils.java
@@ -82,14 +82,14 @@ public void serialize(T value, JsonGenerator generator) {
}
throw new JsonException(
- "Cannot find a serializer for type " + value.getClass().getName() + ". Consider using a full-featured JsonpMapper"
+ "Cannot find a serializer for type " + value.getClass().getName() + ". Consider using a full-featured JsonpMapper."
);
}
@Override
protected JsonpDeserializer getDefaultDeserializer(Class clazz) {
throw new JsonException(
- "Cannot find a default deserializer for type " + clazz.getName() + ". Consider using a full-featured JsonpMapper"
+ "Cannot find a default deserializer for type " + clazz.getName() + ". Consider using a full-featured JsonpMapper."
);
}
};
diff --git a/java-client/src/main/java/org/opensearch/client/json/PlainJsonSerializable.java b/java-client/src/main/java/org/opensearch/client/json/PlainJsonSerializable.java
new file mode 100644
index 0000000000..501aa1a62a
--- /dev/null
+++ b/java-client/src/main/java/org/opensearch/client/json/PlainJsonSerializable.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.client.json;
+
+import jakarta.json.stream.JsonGenerator;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.UncheckedIOException;
+
+public interface PlainJsonSerializable extends JsonpSerializable {
+
+ /**
+ * A default method which returns string representation for the instances of classes
+ * implementing JsonpSerializable interface.
+ * Usage : Eg for SearchRequest.class{@code SearchRequest implements PlainJsonSerializable{..}
+ * SearchRequest searchRequest = SearchRequest.of(request -> request...);
+ * String searchRequestString = searchRequest.writeValueAsString();}
+ *
+ */
+ default String toJsonString() {
+ try (StringWriter writer = new StringWriter()) {
+ try (JsonGenerator generator = JsonpUtils.DEFAULT_PROVIDER.createGenerator(writer)) {
+ serialize(generator, JsonpUtils.DEFAULT_JSONP_MAPPER);
+ }
+ return writer.toString();
+ } catch (IOException ex) {
+ throw new UncheckedIOException(ex);
+ }
+ }
+
+}
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 96afe7515c..17037c3447 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
@@ -35,14 +35,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.AcknowledgedResponseBase
-public abstract class AcknowledgedResponseBase implements JsonpSerializable {
+public abstract class AcknowledgedResponseBase implements PlainJsonSerializable {
private final boolean 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 abd2b4204e..4494087382 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
@@ -38,14 +38,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _spec_utils.BaseNode
-public abstract class BaseNode implements JsonpSerializable {
+public abstract class BaseNode implements PlainJsonSerializable {
private final Map attributes;
private final String host;
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 4718d336ab..a9b69d92b8 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.BulkIndexByScrollFailure
@JsonpDeserializable
-public class BulkIndexByScrollFailure implements JsonpSerializable {
+public class BulkIndexByScrollFailure implements PlainJsonSerializable {
private final ErrorCause cause;
private final String id;
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 ab174f1dcf..1b580be694 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.BulkStats
@JsonpDeserializable
-public class BulkStats implements JsonpSerializable {
+public class BulkStats implements PlainJsonSerializable {
private final long totalOperations;
@Nullable
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 025ebbe097..b4ae6ae3fd 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.ClusterStatistics
@JsonpDeserializable
-public class ClusterStatistics implements JsonpSerializable {
+public class ClusterStatistics implements PlainJsonSerializable {
private final int skipped;
private final int successful;
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 85a4f4c1d3..1bc935b886 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.CompletionStats
@JsonpDeserializable
-public class CompletionStats implements JsonpSerializable {
+public class CompletionStats implements PlainJsonSerializable {
private final long sizeInBytes;
@Nullable
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 0551e8642c..d6851e85f1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.CoordsGeoBounds
@JsonpDeserializable
-public class CoordsGeoBounds implements JsonpSerializable {
+public class CoordsGeoBounds implements PlainJsonSerializable {
private final double top;
private final double bottom;
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 25f5f8a39f..eb9fd22006 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.DocStats
@JsonpDeserializable
-public class DocStats implements JsonpSerializable {
+public class DocStats implements PlainJsonSerializable {
private final long count;
private final long 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 2bac7df617..16a2f7fbb3 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
@@ -36,7 +36,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
/**
@@ -44,7 +44,7 @@
*
*/
@JsonpDeserializable
-public class EmptyObject implements JsonpSerializable {
+public class EmptyObject implements PlainJsonSerializable {
public static final class Builder implements ObjectBuilder {
@Override
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 6d298b5a7c..a6be6216d9 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
@@ -36,11 +36,11 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
@JsonpDeserializable
-public class EmptyTransform implements JsonpSerializable {
+public class EmptyTransform implements PlainJsonSerializable {
public static final class Builder implements ObjectBuilder {
@Override
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 469134d325..131f7046e5 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -57,7 +57,7 @@
* on the error type.
*/
@JsonpDeserializable
-public class ErrorCause implements JsonpSerializable {
+public class ErrorCause implements PlainJsonSerializable {
private final Map metadata;
private final String type;
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 995c9afd89..e59b401d1d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.json.UnionDeserializer;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -53,7 +53,7 @@
*
*/
@JsonpDeserializable
-public class ErrorResponse implements JsonpSerializable {
+public class ErrorResponse implements PlainJsonSerializable {
private enum Kind {
OBJECT,
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 b202739387..316cfbeef6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.FieldMemoryUsage
@JsonpDeserializable
-public class FieldMemoryUsage implements JsonpSerializable {
+public class FieldMemoryUsage implements PlainJsonSerializable {
@Nullable
private final String memorySize;
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 9d90e1e566..3df85fe477 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.FieldSizeUsage
@JsonpDeserializable
-public class FieldSizeUsage implements JsonpSerializable {
+public class FieldSizeUsage implements PlainJsonSerializable {
@Nullable
private final String size;
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 08806a7cc8..b25f46697f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.FieldType;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _types.FieldSort
@JsonpDeserializable
-public class FieldSort implements JsonpSerializable {
+public class FieldSort implements PlainJsonSerializable {
// Single key dictionary
private final String field;
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 ece673c2b5..97e913f9b0 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.FielddataStats
@JsonpDeserializable
-public class FielddataStats implements JsonpSerializable {
+public class FielddataStats implements PlainJsonSerializable {
@Nullable
private final Long evictions;
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 709cc8f81e..63c8a54d0a 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.FlushStats
@JsonpDeserializable
-public class FlushStats implements JsonpSerializable {
+public class FlushStats implements PlainJsonSerializable {
private final long periodic;
private final long total;
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 ddb345f60d..a9ed18b6d5 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.GeoHashLocation
@JsonpDeserializable
-public class GeoHashLocation implements JsonpSerializable {
+public class GeoHashLocation implements PlainJsonSerializable {
private final String geohash;
// ---------------------------------------------------------------------------------------------
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 0b21c874f9..071f119420 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -52,7 +52,7 @@
*
*/
@JsonpDeserializable
-public class GeoLine implements JsonpSerializable {
+public class GeoLine implements PlainJsonSerializable {
private final String type;
private final List> coordinates;
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 4e53545c95..1e35cc72ce 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.GetStats
@JsonpDeserializable
-public class GetStats implements JsonpSerializable {
+public class GetStats implements PlainJsonSerializable {
private final long current;
@Nullable
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 9c81681f7a..da024b35f7 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.IndexingStats
@JsonpDeserializable
-public class IndexingStats implements JsonpSerializable {
+public class IndexingStats implements PlainJsonSerializable {
private final long indexCurrent;
private final long deleteCurrent;
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 35b87c0045..53416597f7 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
@@ -41,18 +41,18 @@
import org.opensearch.client.json.JsonData;
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.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.InlineGet
-public class InlineGet implements JsonpSerializable {
+public class InlineGet implements PlainJsonSerializable {
private final Map metadata;
private final Map fields;
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 986416874a..972e9e9aaa 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.LatLonGeoLocation
@JsonpDeserializable
-public class LatLonGeoLocation implements JsonpSerializable {
+public class LatLonGeoLocation implements PlainJsonSerializable {
private final double lat;
private final double lon;
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 7a09b9de4a..b7c743e2d6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.MergesStats
@JsonpDeserializable
-public class MergesStats implements JsonpSerializable {
+public class MergesStats implements PlainJsonSerializable {
private final long current;
private final long currentDocs;
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 366abbca50..d6ad211a56 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _types.NestedSortValue
@JsonpDeserializable
-public class NestedSortValue implements JsonpSerializable {
+public class NestedSortValue implements PlainJsonSerializable {
@Nullable
private final Query filter;
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 ac02a7b1d3..f470e1b448 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _types.NodeAttributes
@JsonpDeserializable
-public class NodeAttributes implements JsonpSerializable {
+public class NodeAttributes implements PlainJsonSerializable {
private final Map attributes;
private final String ephemeralId;
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 2e504aa517..bb657d0f79 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.cluster.allocation_explain.UnassignedInformation;
import org.opensearch.client.opensearch.indices.stats.ShardRoutingState;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: _types.NodeShard
@JsonpDeserializable
-public class NodeShard implements JsonpSerializable {
+public class NodeShard implements PlainJsonSerializable {
private final ShardRoutingState state;
private final boolean primary;
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 61bc2e5fc1..94f7e0ae83 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.NodeStatistics
@JsonpDeserializable
-public class NodeStatistics implements JsonpSerializable {
+public class NodeStatistics implements PlainJsonSerializable {
private final List failures;
private final int total;
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 9ed07791d4..564923a60b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.PluginStats
@JsonpDeserializable
-public class PluginStats implements JsonpSerializable {
+public class PluginStats implements PlainJsonSerializable {
private final String classname;
private final String description;
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 848038a336..3ee1dedd97 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.QueryCacheStats
@JsonpDeserializable
-public class QueryCacheStats implements JsonpSerializable {
+public class QueryCacheStats implements PlainJsonSerializable {
private final long cacheCount;
private final long cacheSize;
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 80f4d182ff..5a7b70f24e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.RecoveryStats
@JsonpDeserializable
-public class RecoveryStats implements JsonpSerializable {
+public class RecoveryStats implements PlainJsonSerializable {
private final long currentAsSource;
private final long currentAsTarget;
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 bfa6015a4b..8fc7ab801b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.RefreshStats
@JsonpDeserializable
-public class RefreshStats implements JsonpSerializable {
+public class RefreshStats implements PlainJsonSerializable {
private final long externalTotal;
private final long externalTotalTimeInMillis;
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 1b7a25c28f..6f026a8566 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.RequestCacheStats
@JsonpDeserializable
-public class RequestCacheStats implements JsonpSerializable {
+public class RequestCacheStats implements PlainJsonSerializable {
private final long evictions;
private final long hitCount;
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 235a05576c..0b4984e238 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.Retries
@JsonpDeserializable
-public class Retries implements JsonpSerializable {
+public class Retries implements PlainJsonSerializable {
private final long bulk;
private final long search;
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 cb31efd18e..b035508712 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
@@ -38,14 +38,14 @@
import org.opensearch.client.json.JsonData;
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.ScriptBase
-public abstract class ScriptBase implements JsonpSerializable {
+public abstract class ScriptBase implements PlainJsonSerializable {
private final Map params;
// ---------------------------------------------------------------------------------------------
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 1324f49718..29ab643885 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.ScriptField
@JsonpDeserializable
-public class ScriptField implements JsonpSerializable {
+public class ScriptField implements PlainJsonSerializable {
private final Script script;
@Nullable
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 026d8ce8de..69efa95b89 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.SearchStats
@JsonpDeserializable
-public class SearchStats implements JsonpSerializable {
+public class SearchStats implements PlainJsonSerializable {
private final long fetchCurrent;
private final long fetchTimeInMillis;
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 d8175a3d9c..a3c6448918 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.stats.ShardFileSizeInfo;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _types.SegmentsStats
@JsonpDeserializable
-public class SegmentsStats implements JsonpSerializable {
+public class SegmentsStats implements PlainJsonSerializable {
private final int count;
@Nullable
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 cb3d8b9035..cf142da1d5 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.ShardFailure
@JsonpDeserializable
-public class ShardFailure implements JsonpSerializable {
+public class ShardFailure implements PlainJsonSerializable {
@Nullable
private final String index;
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 af53a7c7b0..5a335c7a83 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.ShardStatistics
@JsonpDeserializable
-public class ShardStatistics implements JsonpSerializable {
+public class ShardStatistics implements PlainJsonSerializable {
private final Number failed;
private final Number successful;
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 92d78f301b..a934ae5adb 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
@@ -35,15 +35,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.ShardsOperationResponseBase
-public abstract class ShardsOperationResponseBase implements JsonpSerializable {
+public abstract class ShardsOperationResponseBase implements PlainJsonSerializable {
private final ShardStatistics 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 2a7d9ca047..660952941e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.SlicedScroll
@JsonpDeserializable
-public class SlicedScroll implements JsonpSerializable {
+public class SlicedScroll implements PlainJsonSerializable {
@Nullable
private final String field;
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 829ede92c6..267f57aec8 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.StoreStats
@JsonpDeserializable
-public class StoreStats implements JsonpSerializable {
+public class StoreStats implements PlainJsonSerializable {
@Nullable
private final String size;
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 81bfc637b1..2179cb6b3e 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.StoredScript
@JsonpDeserializable
-public class StoredScript implements JsonpSerializable {
+public class StoredScript implements PlainJsonSerializable {
private final String lang;
private final Map options;
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 26b386d58c..6d1b7e1ba8 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.TopLeftBottomRightGeoBounds
@JsonpDeserializable
-public class TopLeftBottomRightGeoBounds implements JsonpSerializable {
+public class TopLeftBottomRightGeoBounds implements PlainJsonSerializable {
private final GeoLocation topLeft;
private final GeoLocation bottomRight;
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 8dbcd66489..c662800744 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.TopRightBottomLeftGeoBounds
@JsonpDeserializable
-public class TopRightBottomLeftGeoBounds implements JsonpSerializable {
+public class TopRightBottomLeftGeoBounds implements PlainJsonSerializable {
private final GeoLocation topRight;
private final GeoLocation bottomLeft;
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 1edbf3c210..6c7652fd30 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.TranslogStats
@JsonpDeserializable
-public class TranslogStats implements JsonpSerializable {
+public class TranslogStats implements PlainJsonSerializable {
private final long earliestLastModifiedAge;
private final long operations;
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 2c2a8b3158..f478d1643a 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.WarmerStats
@JsonpDeserializable
-public class WarmerStats implements JsonpSerializable {
+public class WarmerStats implements PlainJsonSerializable {
private final long current;
private final long total;
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 16c2202ed9..4a17c9fda1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.WktGeoBounds
@JsonpDeserializable
-public class WktGeoBounds implements JsonpSerializable {
+public class WktGeoBounds implements PlainJsonSerializable {
private final String 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 1e6c3e8411..27244d3539 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
@@ -37,15 +37,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.WriteResponseBase
-public abstract class WriteResponseBase implements JsonpSerializable {
+public abstract class WriteResponseBase implements PlainJsonSerializable {
private final String id;
private final String index;
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 b395f8d69b..caf7016007 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
@@ -38,14 +38,14 @@
import org.opensearch.client.json.JsonData;
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.AggregateBase
-public abstract class AggregateBase implements JsonpSerializable {
+public abstract class AggregateBase implements PlainJsonSerializable {
private final Map meta;
// ---------------------------------------------------------------------------------------------
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 7ec6dce4c8..3308e003e9 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
@@ -38,14 +38,14 @@
import org.opensearch.client.json.JsonData;
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.Aggregation
-public abstract class AggregationBase implements JsonpSerializable {
+public abstract class AggregationBase implements PlainJsonSerializable {
private final Map meta;
@Nullable
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 29960c5fdf..2175adc8ba 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.AggregationRange
@JsonpDeserializable
-public class AggregationRange implements JsonpSerializable {
+public class AggregationRange implements PlainJsonSerializable {
@Nullable
private final String from;
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 34cf7c6ae9..11cfa415d0 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
@@ -38,10 +38,10 @@
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.JsonpUtils;
import org.opensearch.client.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.aggregations.ArrayPercentilesItem
@JsonpDeserializable
-public class ArrayPercentilesItem implements JsonpSerializable {
+public class ArrayPercentilesItem implements PlainJsonSerializable {
private final String key;
private final double value;
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 9a1f4b2fbe..613765b973 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.ChiSquareHeuristic
@JsonpDeserializable
-public class ChiSquareHeuristic implements JsonpSerializable {
+public class ChiSquareHeuristic implements PlainJsonSerializable {
private final boolean backgroundIsSuperset;
private final boolean includeNegatives;
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 002a2d37b6..d7cd918a01 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.ClassificationInferenceOptions
@JsonpDeserializable
-public class ClassificationInferenceOptions implements JsonpSerializable {
+public class ClassificationInferenceOptions implements PlainJsonSerializable {
@Nullable
private final Integer numTopClasses;
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 5d11e2b4f9..e83a6d3087 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.CompositeAggregationSource
@JsonpDeserializable
-public class CompositeAggregationSource implements JsonpSerializable {
+public class CompositeAggregationSource implements PlainJsonSerializable {
@Nullable
private final CompositeTermsAggregationSource terms;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java
index 29d5b8e4ad..d758be85fe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/aggregations/CompositeValuesSource.java
@@ -13,14 +13,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.opensearch._types.SortOrder;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
-public abstract class CompositeValuesSource implements JsonpSerializable {
+public abstract class CompositeValuesSource implements PlainJsonSerializable {
@Nullable
private final String field;
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 9ed347c446..98eddedc82 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.DateRangeExpression
@JsonpDeserializable
-public class DateRangeExpression implements JsonpSerializable {
+public class DateRangeExpression implements PlainJsonSerializable {
@Nullable
private final FieldDateMath from;
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 ba3ceee21a..1301481666 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.EwmaModelSettings
@JsonpDeserializable
-public class EwmaModelSettings implements JsonpSerializable {
+public class EwmaModelSettings implements PlainJsonSerializable {
@Nullable
private final Float alpha;
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 8b244e34ba..dac565ef96 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
@@ -38,18 +38,18 @@
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.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.ExtendedBounds
-public class ExtendedBounds implements JsonpSerializable {
+public class ExtendedBounds implements PlainJsonSerializable {
private final T max;
private final T min;
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 5ee23e7d8d..99df9cbc55 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.GeoLinePoint
@JsonpDeserializable
-public class GeoLinePoint implements JsonpSerializable {
+public class GeoLinePoint implements PlainJsonSerializable {
private final String 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 713e3fcddc..d950d083eb 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.GeoLineSort
@JsonpDeserializable
-public class GeoLineSort implements JsonpSerializable {
+public class GeoLineSort implements PlainJsonSerializable {
private final String field;
// ---------------------------------------------------------------------------------------------
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 586bbefe8f..4cd3413f2b 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.GoogleNormalizedDistanceHeuristic
@JsonpDeserializable
-public class GoogleNormalizedDistanceHeuristic implements JsonpSerializable {
+public class GoogleNormalizedDistanceHeuristic implements PlainJsonSerializable {
@Nullable
private final Boolean backgroundIsSuperset;
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 30583cf6d0..a4d0c1d8c5 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.HdrMethod
@JsonpDeserializable
-public class HdrMethod implements JsonpSerializable {
+public class HdrMethod implements PlainJsonSerializable {
@Nullable
private final Integer numberOfSignificantValueDigits;
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 4b316e057a..128cbd87c0 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.SortOrder;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.HistogramOrder
@JsonpDeserializable
-public class HistogramOrder implements JsonpSerializable {
+public class HistogramOrder implements PlainJsonSerializable {
@Nullable
private final SortOrder count;
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 f362f6c42e..83c91d8b1e 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.HoltLinearModelSettings
@JsonpDeserializable
-public class HoltLinearModelSettings implements JsonpSerializable {
+public class HoltLinearModelSettings implements PlainJsonSerializable {
@Nullable
private final Float alpha;
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 b59ba41ed2..e784789a5d 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.HoltWintersModelSettings
@JsonpDeserializable
-public class HoltWintersModelSettings implements JsonpSerializable {
+public class HoltWintersModelSettings implements PlainJsonSerializable {
@Nullable
private final Float alpha;
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 17a5101558..9fa2595c57 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.InferenceClassImportance
@JsonpDeserializable
-public class InferenceClassImportance implements JsonpSerializable {
+public class InferenceClassImportance implements PlainJsonSerializable {
private final String className;
private final double 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 3a6b26772d..a4a0d25f95 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.InferenceConfigContainer
@JsonpDeserializable
-public class InferenceConfig implements JsonpSerializable {
+public class InferenceConfig implements PlainJsonSerializable {
@Nullable
private final RegressionInferenceOptions regression;
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 caf2372fa0..1cb24b5d95 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.aggregations.InferenceFeatureImportance
@JsonpDeserializable
-public class InferenceFeatureImportance implements JsonpSerializable {
+public class InferenceFeatureImportance implements PlainJsonSerializable {
private final String featureName;
@Nullable
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 4220fc8cfd..28f8b99f4c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.FieldValue;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.InferenceTopClassEntry
@JsonpDeserializable
-public class InferenceTopClassEntry implements JsonpSerializable {
+public class InferenceTopClassEntry implements PlainJsonSerializable {
private final FieldValue className;
private final double classProbability;
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 bdd9d3beb7..024a653d61 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.IpRangeAggregationRange
@JsonpDeserializable
-public class IpRangeAggregationRange implements JsonpSerializable {
+public class IpRangeAggregationRange implements PlainJsonSerializable {
@Nullable
private final String from;
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 56feebd0cb..7670645feb 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.MatrixStatsFields
@JsonpDeserializable
-public class MatrixStatsFields implements JsonpSerializable {
+public class MatrixStatsFields implements PlainJsonSerializable {
private final String name;
private final long count;
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 d512d1e962..57a372478a 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
@@ -37,8 +37,8 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.FieldValue;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.util.ObjectBuilder;
@@ -46,7 +46,7 @@
// typedef: _types.aggregations.MetricAggregationBase
-public abstract class MetricAggregationBase implements JsonpSerializable {
+public abstract class MetricAggregationBase implements PlainJsonSerializable {
@Nullable
private final String field;
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 8a2e401303..cd8cca9573 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
@@ -40,8 +40,8 @@
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.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -54,7 +54,7 @@
*
*/
-public abstract class MultiBucketBase implements JsonpSerializable {
+public abstract class MultiBucketBase implements PlainJsonSerializable {
private final Map aggregations;
private final long docCount;
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 524b2fb7ff..32e130cc2c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.MultiTermLookup
@JsonpDeserializable
-public class MultiTermLookup implements JsonpSerializable {
+public class MultiTermLookup implements PlainJsonSerializable {
private final String field;
// ---------------------------------------------------------------------------------------------
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 2878ac7c06..5cff33b37d 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.MutualInformationHeuristic
@JsonpDeserializable
-public class MutualInformationHeuristic implements JsonpSerializable {
+public class MutualInformationHeuristic implements PlainJsonSerializable {
@Nullable
private final Boolean backgroundIsSuperset;
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 e76099f0ba..ec287eb79f 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
@@ -36,11 +36,11 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
@JsonpDeserializable
-public class PercentageScoreHeuristic implements JsonpSerializable {
+public class PercentageScoreHeuristic implements PlainJsonSerializable {
public static final class Builder implements ObjectBuilder {
@Override
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 bd2e3dc1b4..d7910332b8 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.RegressionInferenceOptions
@JsonpDeserializable
-public class RegressionInferenceOptions implements JsonpSerializable {
+public class RegressionInferenceOptions implements PlainJsonSerializable {
@Nullable
private final String resultsField;
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 a242a2f2a7..d8bc2f76c8 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.ScriptedHeuristic
@JsonpDeserializable
-public class ScriptedHeuristic implements JsonpSerializable {
+public class ScriptedHeuristic implements PlainJsonSerializable {
private final Script script;
// ---------------------------------------------------------------------------------------------
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 45b00862e6..f399a8fe71 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
@@ -37,10 +37,10 @@
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.JsonpUtils;
import org.opensearch.client.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.StandardDeviationBounds
@JsonpDeserializable
-public class StandardDeviationBounds implements JsonpSerializable {
+public class StandardDeviationBounds implements PlainJsonSerializable {
private final double upper;
private final double lower;
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 74fb21b311..9b8de512ee 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.StandardDeviationBoundsAsString
@JsonpDeserializable
-public class StandardDeviationBoundsAsString implements JsonpSerializable {
+public class StandardDeviationBoundsAsString implements PlainJsonSerializable {
private final String upper;
private final String lower;
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 50218c8ff0..02a50e9387 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.aggregations.TDigest
@JsonpDeserializable
-public class TDigest implements JsonpSerializable {
+public class TDigest implements PlainJsonSerializable {
@Nullable
private final Integer compression;
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 cb0165bc67..99b6b1b29e 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.TermsPartition
@JsonpDeserializable
-public class TermsPartition implements JsonpSerializable {
+public class TermsPartition implements PlainJsonSerializable {
private final long numPartitions;
private final long 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 2f6e7c8299..a8e85cd16c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
@@ -50,7 +50,7 @@
// typedef: _types.aggregations.TestPopulation
@JsonpDeserializable
-public class TestPopulation implements JsonpSerializable {
+public class TestPopulation implements PlainJsonSerializable {
private final String field;
@Nullable
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 2136f643df..af8f2bf0e5 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.FieldValue;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _types.aggregations.TopMetrics
@JsonpDeserializable
-public class TopMetrics implements JsonpSerializable {
+public class TopMetrics implements PlainJsonSerializable {
private final List sort;
private final Map metrics;
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 b9028cf9f4..dbc459c19d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.aggregations.TopMetricsValue
@JsonpDeserializable
-public class TopMetricsValue implements JsonpSerializable {
+public class TopMetricsValue implements PlainJsonSerializable {
private final String field;
// ---------------------------------------------------------------------------------------------
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 c69e11f2c5..c7fbfb179b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.aggregations.WeightedAverageValue
@JsonpDeserializable
-public class WeightedAverageValue implements JsonpSerializable {
+public class WeightedAverageValue implements PlainJsonSerializable {
@Nullable
private final String field;
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 e8a386a88b..c30cd911d1 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
@@ -36,13 +36,13 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.analysis.CharFilterBase
-public abstract class CharFilterBase implements JsonpSerializable {
+public abstract class CharFilterBase implements PlainJsonSerializable {
@Nullable
private final String version;
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 d4d0c1e81e..6775723c07 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
@@ -36,13 +36,13 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.analysis.TokenFilterBase
-public abstract class TokenFilterBase implements JsonpSerializable {
+public abstract class TokenFilterBase implements PlainJsonSerializable {
@Nullable
private final String version;
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 10ff21a4cc..c59e801b43 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
@@ -36,13 +36,13 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.analysis.TokenizerBase
-public abstract class TokenizerBase implements JsonpSerializable {
+public abstract class TokenizerBase implements PlainJsonSerializable {
@Nullable
private final String version;
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 f9b930c234..d9e675fdf9 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.AllField
@JsonpDeserializable
-public class AllField implements JsonpSerializable {
+public class AllField implements PlainJsonSerializable {
private final String analyzer;
private final boolean enabled;
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 8ba7139a21..568ee8a3b3 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.mapping.DynamicTemplate
@JsonpDeserializable
-public class DynamicTemplate implements JsonpSerializable {
+public class DynamicTemplate implements PlainJsonSerializable {
@Nullable
private final Property mapping;
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 85a3ed6ca8..009e6708d8 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.mapping.FieldMapping
@JsonpDeserializable
-public class FieldMapping implements JsonpSerializable {
+public class FieldMapping implements PlainJsonSerializable {
private final String fullName;
private final Map 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 ec4068d0fe..9dc6cd084c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.FieldNamesField
@JsonpDeserializable
-public class FieldNamesField implements JsonpSerializable {
+public class FieldNamesField implements PlainJsonSerializable {
private final boolean enabled;
// ---------------------------------------------------------------------------------------------
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 2c2ecd4058..47900c18c0 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.IndexField
@JsonpDeserializable
-public class IndexField implements JsonpSerializable {
+public class IndexField implements PlainJsonSerializable {
private final boolean enabled;
// ---------------------------------------------------------------------------------------------
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 5d1aae66c6..b9077a43da 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
@@ -16,9 +16,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -26,7 +26,7 @@
// typedef: _types.mapping.KnnVectorMethod
@JsonpDeserializable
-public class KnnVectorMethod implements JsonpSerializable {
+public class KnnVectorMethod implements PlainJsonSerializable {
/**
* Builder for {@link KnnVectorMethod}.
*/
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 7995dc6137..422149d5b5 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
@@ -39,15 +39,15 @@
import org.opensearch.client.json.JsonData;
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.mapping.PropertyBase
-public abstract class PropertyBase implements JsonpSerializable {
+public abstract class PropertyBase implements PlainJsonSerializable {
private final Map localMetadata;
private final Map meta;
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 de915186ea..3882835104 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.RoutingField
@JsonpDeserializable
-public class RoutingField implements JsonpSerializable {
+public class RoutingField implements PlainJsonSerializable {
private final boolean 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 5c8b090cd4..e7bf93979c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _types.mapping.RuntimeField
@JsonpDeserializable
-public class RuntimeField implements JsonpSerializable {
+public class RuntimeField implements PlainJsonSerializable {
@Nullable
private final String format;
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 e3cca8d5e0..c0f633dbb1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.SizeField
@JsonpDeserializable
-public class SizeField implements JsonpSerializable {
+public class SizeField implements PlainJsonSerializable {
private final boolean 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 8bad7f6f84..0fcaf11cf3 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.mapping.SourceField
@JsonpDeserializable
-public class SourceField implements JsonpSerializable {
+public class SourceField implements PlainJsonSerializable {
@Nullable
private final Boolean compress;
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 865b45a05d..3315a15bfb 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.mapping.SuggestContext
@JsonpDeserializable
-public class SuggestContext implements JsonpSerializable {
+public class SuggestContext implements PlainJsonSerializable {
private final String name;
@Nullable
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 9a1c7efa6f..a74d31c9b0 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.mapping.TextIndexPrefixes
@JsonpDeserializable
-public class TextIndexPrefixes implements JsonpSerializable {
+public class TextIndexPrefixes implements PlainJsonSerializable {
private final int maxChars;
private final int minChars;
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 066316f890..7d8adceabf 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -51,7 +51,7 @@
// typedef: _types.mapping.TypeMapping
@JsonpDeserializable
-public class TypeMapping implements JsonpSerializable {
+public class TypeMapping implements PlainJsonSerializable {
@Nullable
private final AllField allField;
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 78caeecbc4..2b306a643e 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
@@ -39,16 +39,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.query_dsl.DecayPlacement
@JsonpDeserializable
-public class DecayPlacement implements JsonpSerializable {
+public class DecayPlacement implements PlainJsonSerializable {
@Nullable
private final Double decay;
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 bbfb8629c4..5821041696 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -53,7 +53,7 @@
*
*/
@JsonpDeserializable
-public class FieldAndFormat implements JsonpSerializable {
+public class FieldAndFormat implements PlainJsonSerializable {
private final String field;
@Nullable
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 6f43462366..ed18108de1 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.query_dsl.FieldLookup
@JsonpDeserializable
-public class FieldLookup implements JsonpSerializable {
+public class FieldLookup implements PlainJsonSerializable {
private final String id;
@Nullable
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 b476e7763b..c48bab9060 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.GeoLocation;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _types.query_dsl.GeoPolygonPoints
@JsonpDeserializable
-public class GeoPolygonPoints implements JsonpSerializable {
+public class GeoPolygonPoints implements PlainJsonSerializable {
private final List points;
// ---------------------------------------------------------------------------------------------
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 9e984b42b0..7fe4fa2f5d 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.GeoShapeRelation;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _types.query_dsl.GeoShapeFieldQuery
@JsonpDeserializable
-public class GeoShapeFieldQuery implements JsonpSerializable {
+public class GeoShapeFieldQuery implements PlainJsonSerializable {
@Nullable
private final JsonData shape;
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 520847812b..768b569868 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.VersionType;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -52,7 +52,7 @@
// typedef: _types.query_dsl.LikeDocument
@JsonpDeserializable
-public class LikeDocument implements JsonpSerializable {
+public class LikeDocument implements PlainJsonSerializable {
@Nullable
private final JsonData doc;
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 39f8f35902..244f8091de 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.query_dsl.PinnedDoc
@JsonpDeserializable
-public class PinnedDoc implements JsonpSerializable {
+public class PinnedDoc implements PlainJsonSerializable {
private final String id;
private final String index;
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 c700d6f541..b08abdbd6a 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
@@ -36,13 +36,13 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.query_dsl.QueryBase
-public abstract class QueryBase implements JsonpSerializable {
+public abstract class QueryBase implements PlainJsonSerializable {
@Nullable
private final Float boost;
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 c3ac825a98..1bdb0b785e 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
@@ -36,11 +36,11 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
@JsonpDeserializable
-public class RankFeatureFunctionLinear extends RankFeatureFunction implements JsonpSerializable {
+public class RankFeatureFunctionLinear extends RankFeatureFunction implements PlainJsonSerializable {
public static final class Builder implements ObjectBuilder {
@Override
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 5ca1477eb7..061a8a5ed5 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.query_dsl.RankFeatureFunctionLogarithm
@JsonpDeserializable
-public class RankFeatureFunctionLogarithm extends RankFeatureFunction implements JsonpSerializable {
+public class RankFeatureFunctionLogarithm extends RankFeatureFunction implements PlainJsonSerializable {
private final float scalingFactor;
// ---------------------------------------------------------------------------------------------
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 b7e07967f0..4e1ff317cc 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.query_dsl.RankFeatureFunctionSaturation
@JsonpDeserializable
-public class RankFeatureFunctionSaturation extends RankFeatureFunction implements JsonpSerializable {
+public class RankFeatureFunctionSaturation extends RankFeatureFunction implements PlainJsonSerializable {
@Nullable
private final Float 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 4c41cd9f31..47763778e9 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _types.query_dsl.RankFeatureFunctionSigmoid
@JsonpDeserializable
-public class RankFeatureFunctionSigmoid extends RankFeatureFunction implements JsonpSerializable {
+public class RankFeatureFunctionSigmoid extends RankFeatureFunction implements PlainJsonSerializable {
private final float pivot;
private final float exponent;
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 3f81cbe6af..893140d1c8 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
@@ -37,14 +37,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.query_dsl.ScoreFunctionBase
-public abstract class ScoreFunctionBase implements JsonpSerializable {
+public abstract class ScoreFunctionBase implements PlainJsonSerializable {
@Nullable
private final Query filter;
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 5a26eeb2c8..bc0b4303b0 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _types.query_dsl.TermsLookup
@JsonpDeserializable
-public class TermsLookup implements JsonpSerializable {
+public class TermsLookup implements PlainJsonSerializable {
private final String index;
private final String id;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeFieldQuery.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeFieldQuery.java
index cca95afd6e..0ee91dcc0a 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeFieldQuery.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/XyShapeFieldQuery.java
@@ -35,13 +35,18 @@
import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.opensearch.client.json.*;
+import org.opensearch.client.json.JsonData;
+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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.GeoShapeRelation;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _types.query_dsl.XyShapeFieldQuery
-public class XyShapeFieldQuery implements JsonpSerializable {
+public class XyShapeFieldQuery implements PlainJsonSerializable {
@Nullable
private final FieldLookup indexedShape;
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 a3ea02448a..9988b93b0c 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.aliases.AliasesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.aliases.Response
@JsonpDeserializable
-public class AliasesResponse implements JsonpSerializable {
+public class AliasesResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 750219a18b..0e4c06f275 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.allocation.AllocationRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.allocation.Response
@JsonpDeserializable
-public class AllocationResponse implements JsonpSerializable {
+public class AllocationResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 9843696aeb..2e85797fc9 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.cluster_manager.ClusterManagerRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.cluster_manager.Response
@JsonpDeserializable
-public class ClusterManagerResponse implements JsonpSerializable {
+public class ClusterManagerResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 6e6009a8e2..435c126280 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.count.CountRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.count.Response
@JsonpDeserializable
-public class CountResponse implements JsonpSerializable {
+public class CountResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 88299a0100..47edbd31ce 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.fielddata.FielddataRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.fielddata.Response
@JsonpDeserializable
-public class FielddataResponse implements JsonpSerializable {
+public class FielddataResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 f3c5fa6e28..e6c9ba92dd 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.health.HealthRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.health.Response
@JsonpDeserializable
-public class HealthResponse implements JsonpSerializable {
+public class HealthResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 0b075024c6..37264d05b3 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.help.HelpRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.help.Response
@JsonpDeserializable
-public class HelpResponse implements JsonpSerializable {
+public class HelpResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 d95eeeaab6..f8fb10bf5b 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.indices.IndicesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.indices.Response
@JsonpDeserializable
-public class IndicesResponse implements JsonpSerializable {
+public class IndicesResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 e58f09e794..dd336e44df 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.nodeattrs.NodeAttributesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.nodeattrs.Response
@JsonpDeserializable
-public class NodeattrsResponse implements JsonpSerializable {
+public class NodeattrsResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 e1646136f1..9843ab40b0 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.nodes.NodesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.nodes.Response
@JsonpDeserializable
-public class NodesResponse implements JsonpSerializable {
+public class NodesResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 2f3f94f0b4..3d7e4545ab 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.pending_tasks.PendingTasksRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.pending_tasks.Response
@JsonpDeserializable
-public class PendingTasksResponse implements JsonpSerializable {
+public class PendingTasksResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 ba19364179..1c43156668 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.plugins.PluginsRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.plugins.Response
@JsonpDeserializable
-public class PluginsResponse implements JsonpSerializable {
+public class PluginsResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 afdcfaf8ab..8f38f6a5f5 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.recovery.RecoveryRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.recovery.Response
@JsonpDeserializable
-public class RecoveryResponse implements JsonpSerializable {
+public class RecoveryResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 238506c41c..009f736bd9 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.repositories.RepositoriesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.repositories.Response
@JsonpDeserializable
-public class RepositoriesResponse implements JsonpSerializable {
+public class RepositoriesResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 3d5ed6ca87..b3a6ee422e 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.segments.SegmentsRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.segments.Response
@JsonpDeserializable
-public class SegmentsResponse implements JsonpSerializable {
+public class SegmentsResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 f6e28db9c8..d714051353 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.shards.ShardsRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.shards.Response
@JsonpDeserializable
-public class ShardsResponse implements JsonpSerializable {
+public class ShardsResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 ffa0d72ea5..b059a35cec 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.snapshots.SnapshotsRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.snapshots.Response
@JsonpDeserializable
-public class SnapshotsResponse implements JsonpSerializable {
+public class SnapshotsResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 09742b32ae..bff415e614 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.tasks.TasksRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.tasks.Response
@JsonpDeserializable
-public class TasksResponse implements JsonpSerializable {
+public class TasksResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 2f3e9a7b97..f9be18da9e 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.templates.TemplatesRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.templates.Response
@JsonpDeserializable
-public class TemplatesResponse implements JsonpSerializable {
+public class TemplatesResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 95bd8eec5e..5369159405 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch.cat.thread_pool.ThreadPoolRecord;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -47,7 +47,7 @@
// typedef: cat.thread_pool.Response
@JsonpDeserializable
-public class ThreadPoolResponse implements JsonpSerializable {
+public class ThreadPoolResponse implements PlainJsonSerializable {
private final List valueBody;
// ---------------------------------------------------------------------------------------------
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 6c15bacbd2..54c40dc8d1 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.aliases.AliasesRecord
@JsonpDeserializable
-public class AliasesRecord implements JsonpSerializable {
+public class AliasesRecord implements PlainJsonSerializable {
@Nullable
private final String alias;
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 86041ea29a..6e5e783d3d 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.allocation.AllocationRecord
@JsonpDeserializable
-public class AllocationRecord implements JsonpSerializable {
+public class AllocationRecord implements PlainJsonSerializable {
@Nullable
private final String shards;
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 0237a8cf0c..908e990c5a 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.cluster_manager.ClusterManagerRecord
@JsonpDeserializable
-public class ClusterManagerRecord implements JsonpSerializable {
+public class ClusterManagerRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 aab10c677e..93d9867cf2 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.count.CountRecord
@JsonpDeserializable
-public class CountRecord implements JsonpSerializable {
+public class CountRecord implements PlainJsonSerializable {
@Nullable
private final String epoch;
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 2c25d74fad..4ffb1e12c0 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.fielddata.FielddataRecord
@JsonpDeserializable
-public class FielddataRecord implements JsonpSerializable {
+public class FielddataRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 8300549435..5ce99313d3 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.health.HealthRecord
@JsonpDeserializable
-public class HealthRecord implements JsonpSerializable {
+public class HealthRecord implements PlainJsonSerializable {
@Nullable
private final String epoch;
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 f1f558c4a9..d3a8a6c12c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cat.help.HelpRecord
@JsonpDeserializable
-public class HelpRecord implements JsonpSerializable {
+public class HelpRecord implements PlainJsonSerializable {
private final String 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 b9f7678fc7..0dfb136833 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.indices.IndicesRecord
@JsonpDeserializable
-public class IndicesRecord implements JsonpSerializable {
+public class IndicesRecord implements PlainJsonSerializable {
@Nullable
private final String health;
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 894061df32..cc1a3185b1 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.nodeattrs.NodeAttributesRecord
@JsonpDeserializable
-public class NodeAttributesRecord implements JsonpSerializable {
+public class NodeAttributesRecord implements PlainJsonSerializable {
@Nullable
private final String node;
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 d7ee25d953..3ffe2ce5e1 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.nodes.NodesRecord
@JsonpDeserializable
-public class NodesRecord implements JsonpSerializable {
+public class NodesRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 8a18a13046..369ffd0af9 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.pending_tasks.PendingTasksRecord
@JsonpDeserializable
-public class PendingTasksRecord implements JsonpSerializable {
+public class PendingTasksRecord implements PlainJsonSerializable {
@Nullable
private final String insertorder;
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 6308cc29d0..4d6db17ce2 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.plugins.PluginsRecord
@JsonpDeserializable
-public class PluginsRecord implements JsonpSerializable {
+public class PluginsRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 3921537f00..477ab7fc9a 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.recovery.RecoveryRecord
@JsonpDeserializable
-public class RecoveryRecord implements JsonpSerializable {
+public class RecoveryRecord implements PlainJsonSerializable {
@Nullable
private final String index;
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 df368d3a24..24a236b59e 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.repositories.RepositoriesRecord
@JsonpDeserializable
-public class RepositoriesRecord implements JsonpSerializable {
+public class RepositoriesRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 261f47f910..abed6827f3 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.segments.SegmentsRecord
@JsonpDeserializable
-public class SegmentsRecord implements JsonpSerializable {
+public class SegmentsRecord implements PlainJsonSerializable {
@Nullable
private final String index;
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 3cc94c1520..f56fe8a362 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.shards.ShardsRecord
@JsonpDeserializable
-public class ShardsRecord implements JsonpSerializable {
+public class ShardsRecord implements PlainJsonSerializable {
@Nullable
private final String index;
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 a21a2448af..c033acd623 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cat.snapshots.SnapshotsRecord
@JsonpDeserializable
-public class SnapshotsRecord implements JsonpSerializable {
+public class SnapshotsRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 79d13a6c63..c45bdffe0f 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.tasks.TasksRecord
@JsonpDeserializable
-public class TasksRecord implements JsonpSerializable {
+public class TasksRecord implements PlainJsonSerializable {
@Nullable
private final String id;
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 10339e2704..ce23a76798 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.templates.TemplatesRecord
@JsonpDeserializable
-public class TemplatesRecord implements JsonpSerializable {
+public class TemplatesRecord implements PlainJsonSerializable {
@Nullable
private final String name;
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 a85e4ab732..6f918dc28c 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cat.thread_pool.ThreadPoolRecord
@JsonpDeserializable
-public class ThreadPoolRecord implements JsonpSerializable {
+public class ThreadPoolRecord implements PlainJsonSerializable {
@Nullable
private final String nodeName;
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 b52153fc1d..9e711de486 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.transport.Endpoint;
@@ -57,7 +57,7 @@
*
*/
@JsonpDeserializable
-public class AllocationExplainRequest extends RequestBase implements JsonpSerializable {
+public class AllocationExplainRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String currentNode;
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 df4a1344d3..f501708731 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
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;
@@ -55,7 +55,7 @@
// typedef: cluster.allocation_explain.Response
@JsonpDeserializable
-public class AllocationExplainResponse implements JsonpSerializable {
+public class AllocationExplainResponse implements PlainJsonSerializable {
@Nullable
private final String allocateExplanation;
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 aaaa2c43b8..a6cce10988 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster._types.ComponentTemplate
@JsonpDeserializable
-public class ComponentTemplate implements JsonpSerializable {
+public class ComponentTemplate implements PlainJsonSerializable {
private final String name;
private final ComponentTemplateNode componentTemplate;
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 5f36b5ec6f..1b2273457d 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: cluster._types.ComponentTemplateNode
@JsonpDeserializable
-public class ComponentTemplateNode implements JsonpSerializable {
+public class ComponentTemplateNode implements PlainJsonSerializable {
private final ComponentTemplateSummary template;
@Nullable
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 2fa218354c..3f6006441e 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.opensearch.indices.AliasDefinition;
import org.opensearch.client.opensearch.indices.IndexSettings;
@@ -53,7 +53,7 @@
// typedef: cluster._types.ComponentTemplateSummary
@JsonpDeserializable
-public class ComponentTemplateSummary implements JsonpSerializable {
+public class ComponentTemplateSummary implements PlainJsonSerializable {
private final Map meta;
@Nullable
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 5e2a6a90e6..98824bdf2c 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: cluster.get_settings.Response
@JsonpDeserializable
-public class GetClusterSettingsResponse implements JsonpSerializable {
+public class GetClusterSettingsResponse implements PlainJsonSerializable {
private final Map persistent;
private final Map transient_;
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 cf08562749..8cd177d19c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.get_component_template.Response
@JsonpDeserializable
-public class GetComponentTemplateResponse implements JsonpSerializable {
+public class GetComponentTemplateResponse implements PlainJsonSerializable {
private final List componentTemplates;
// ---------------------------------------------------------------------------------------------
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 be70fa0212..9f015f4acc 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.HealthStatus;
import org.opensearch.client.opensearch.cluster.health.IndexHealthStats;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: cluster.health.Response
@JsonpDeserializable
-public class HealthResponse implements JsonpSerializable {
+public class HealthResponse implements PlainJsonSerializable {
private final int activePrimaryShards;
private final int activeShards;
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 a30967162a..b18098343b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.cluster.pending_tasks.PendingTask;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: cluster.pending_tasks.Response
@JsonpDeserializable
-public class PendingTasksResponse implements JsonpSerializable {
+public class PendingTasksResponse implements PlainJsonSerializable {
private final List tasks;
// ---------------------------------------------------------------------------------------------
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 7ddcaed934..54583b5631 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -60,7 +60,7 @@
*
*/
@JsonpDeserializable
-public class PutClusterSettingsRequest extends RequestBase implements JsonpSerializable {
+public class PutClusterSettingsRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean flatSettings;
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 5527a0a956..c97ea2c6f7 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: cluster.put_settings.Response
@JsonpDeserializable
-public class PutClusterSettingsResponse implements JsonpSerializable {
+public class PutClusterSettingsResponse implements PlainJsonSerializable {
private final boolean acknowledged;
private final Map persistent;
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 591cff2b51..4e336f9fff 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -64,7 +64,7 @@
*
*/
@JsonpDeserializable
-public class PutComponentTemplateRequest extends RequestBase implements JsonpSerializable {
+public class PutComponentTemplateRequest extends RequestBase implements PlainJsonSerializable {
private final Map meta;
private final Map aliases;
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 23b9882a2b..29891c0aa0 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class RerouteRequest extends RequestBase implements JsonpSerializable {
+public class RerouteRequest extends RequestBase implements PlainJsonSerializable {
private final List commands;
@Nullable
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 e4367d5254..db40d31915 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.cluster.reroute.RerouteExplanation;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -51,7 +51,7 @@
// typedef: cluster.reroute.Response
@JsonpDeserializable
-public class RerouteResponse implements JsonpSerializable {
+public class RerouteResponse implements PlainJsonSerializable {
private final List explanations;
private final JsonData state;
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 0895ca2bcf..5d69fe5a67 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -46,7 +46,7 @@
// typedef: cluster.state.Response
@JsonpDeserializable
-public class StateResponse implements JsonpSerializable {
+public class StateResponse implements PlainJsonSerializable {
private final JsonData valueBody;
// ---------------------------------------------------------------------------------------------
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 8e711f82d1..94be4c0e0f 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.allocation_explain.AllocationDecision
@JsonpDeserializable
-public class AllocationDecision implements JsonpSerializable {
+public class AllocationDecision implements PlainJsonSerializable {
private final String decider;
private final AllocationExplainDecision decision;
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 67c4652de2..c6f43fb968 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.allocation_explain.AllocationStore
@JsonpDeserializable
-public class AllocationStore implements JsonpSerializable {
+public class AllocationStore implements PlainJsonSerializable {
private final String allocationId;
private final boolean found;
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 32d74f607d..4419571b76 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: cluster.allocation_explain.ClusterInfo
@JsonpDeserializable
-public class ClusterInfo implements JsonpSerializable {
+public class ClusterInfo implements PlainJsonSerializable {
private final Map nodes;
private final Map shardSizes;
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 f4faa69a71..441340aaa4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.allocation_explain.CurrentNode
@JsonpDeserializable
-public class CurrentNode implements JsonpSerializable {
+public class CurrentNode implements PlainJsonSerializable {
private final String id;
private final String name;
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 a89c8b336e..3b061ba5f0 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.allocation_explain.DiskUsage
@JsonpDeserializable
-public class DiskUsage implements JsonpSerializable {
+public class DiskUsage implements PlainJsonSerializable {
private final String path;
private final long totalBytes;
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 a5bf29a5dd..79c7783b31 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: cluster.allocation_explain.NodeAllocationExplanation
@JsonpDeserializable
-public class NodeAllocationExplanation implements JsonpSerializable {
+public class NodeAllocationExplanation implements PlainJsonSerializable {
private final List deciders;
private final Map nodeAttributes;
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 2146c9908a..7baacdeb83 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.allocation_explain.NodeDiskUsage
@JsonpDeserializable
-public class NodeDiskUsage implements JsonpSerializable {
+public class NodeDiskUsage implements PlainJsonSerializable {
private final String nodeName;
private final DiskUsage leastAvailable;
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 36e9732f9e..45fee7fb15 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.allocation_explain.ReservedSize
@JsonpDeserializable
-public class ReservedSize implements JsonpSerializable {
+public class ReservedSize implements PlainJsonSerializable {
private final String nodeId;
private final String path;
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 8db5412553..918f22ce28 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.allocation_explain.UnassignedInformation
@JsonpDeserializable
-public class UnassignedInformation implements JsonpSerializable {
+public class UnassignedInformation implements PlainJsonSerializable {
private final String at;
@Nullable
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 7572cefd2f..84dc76af02 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.HealthStatus;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: cluster.health.IndexHealthStats
@JsonpDeserializable
-public class IndexHealthStats implements JsonpSerializable {
+public class IndexHealthStats implements PlainJsonSerializable {
private final int activePrimaryShards;
private final int activeShards;
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 c3face082b..0bf57ed481 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.HealthStatus;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: cluster.health.ShardHealthStats
@JsonpDeserializable
-public class ShardHealthStats implements JsonpSerializable {
+public class ShardHealthStats implements PlainJsonSerializable {
private final int activeShards;
private final int initializingShards;
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 daaedfa1a9..b9cf4b6b60 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.pending_tasks.PendingTask
@JsonpDeserializable
-public class PendingTask implements JsonpSerializable {
+public class PendingTask implements PlainJsonSerializable {
private final boolean executing;
private final int insertOrder;
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 1ca520b5a5..ee3fcf8c29 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: cluster.reroute.Command
@JsonpDeserializable
-public class Command implements JsonpSerializable {
+public class Command implements PlainJsonSerializable {
@Nullable
private final CommandCancelAction cancel;
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 680c155a18..5c5e1df2f4 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.reroute.CommandAllocatePrimaryAction
@JsonpDeserializable
-public class CommandAllocatePrimaryAction implements JsonpSerializable {
+public class CommandAllocatePrimaryAction implements PlainJsonSerializable {
private final String index;
private final int shard;
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 2d4245336c..58c12dce13 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.reroute.CommandAllocateReplicaAction
@JsonpDeserializable
-public class CommandAllocateReplicaAction implements JsonpSerializable {
+public class CommandAllocateReplicaAction implements PlainJsonSerializable {
private final String index;
private final int shard;
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 e7e1bcf731..c3bbba356f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.reroute.CommandCancelAction
@JsonpDeserializable
-public class CommandCancelAction implements JsonpSerializable {
+public class CommandCancelAction implements PlainJsonSerializable {
private final String index;
private final int shard;
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 1fcd576ad4..1d6c6222b3 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.reroute.CommandMoveAction
@JsonpDeserializable
-public class CommandMoveAction implements JsonpSerializable {
+public class CommandMoveAction implements PlainJsonSerializable {
private final String index;
private final int shard;
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 fe8d1e21a8..d9488b90ac 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.reroute.RerouteDecision
@JsonpDeserializable
-public class RerouteDecision implements JsonpSerializable {
+public class RerouteDecision implements PlainJsonSerializable {
private final String decider;
private final String decision;
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 348d0ae90a..9b98cbf783 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.reroute.RerouteExplanation
@JsonpDeserializable
-public class RerouteExplanation implements JsonpSerializable {
+public class RerouteExplanation implements PlainJsonSerializable {
private final String command;
private final List decisions;
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 fda5e90362..64a384a950 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.reroute.RerouteParameters
@JsonpDeserializable
-public class RerouteParameters implements JsonpSerializable {
+public class RerouteParameters implements PlainJsonSerializable {
private final boolean allowPrimary;
private final String index;
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 8a4a1f89bc..43cea2023a 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.CharFilterTypes
@JsonpDeserializable
-public class CharFilterTypes implements JsonpSerializable {
+public class CharFilterTypes implements PlainJsonSerializable {
private final List charFilterTypes;
private final List tokenizerTypes;
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 f9449612bd..0f6a8d38a9 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterFileSystem
@JsonpDeserializable
-public class ClusterFileSystem implements JsonpSerializable {
+public class ClusterFileSystem implements PlainJsonSerializable {
private final long availableInBytes;
private final long freeInBytes;
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 d1b3543a4d..3520b9f0e2 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.CompletionStats;
import org.opensearch.client.opensearch._types.DocStats;
import org.opensearch.client.opensearch._types.FielddataStats;
@@ -55,7 +55,7 @@
// typedef: cluster.stats.ClusterIndices
@JsonpDeserializable
-public class ClusterIndices implements JsonpSerializable {
+public class ClusterIndices implements PlainJsonSerializable {
private final CompletionStats completion;
private final long count;
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 098d19e205..e4137d918b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -51,7 +51,7 @@
*
*/
@JsonpDeserializable
-public class ClusterIndicesShards implements JsonpSerializable {
+public class ClusterIndicesShards implements PlainJsonSerializable {
@Nullable
private final ClusterIndicesShardsIndex index;
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 85823b0882..e0c709f48b 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterIndicesShardsIndex
@JsonpDeserializable
-public class ClusterIndicesShardsIndex implements JsonpSerializable {
+public class ClusterIndicesShardsIndex implements PlainJsonSerializable {
private final ClusterShardMetrics primaries;
private final ClusterShardMetrics replication;
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 d718523105..5edf71cbd4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.ClusterIngest
@JsonpDeserializable
-public class ClusterIngest implements JsonpSerializable {
+public class ClusterIngest implements PlainJsonSerializable {
private final int numberOfPipelines;
private final Map processorStats;
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 a7b5eebb59..78493245ee 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.ClusterJvm
@JsonpDeserializable
-public class ClusterJvm implements JsonpSerializable {
+public class ClusterJvm implements PlainJsonSerializable {
private final long maxUptimeInMillis;
private final ClusterJvmMemory mem;
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 33e34234e4..8a258a0e38 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterJvmMemory
@JsonpDeserializable
-public class ClusterJvmMemory implements JsonpSerializable {
+public class ClusterJvmMemory implements PlainJsonSerializable {
private final long heapMaxInBytes;
private final long heapUsedInBytes;
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 1783b11516..cc366a9f80 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterJvmVersion
@JsonpDeserializable
-public class ClusterJvmVersion implements JsonpSerializable {
+public class ClusterJvmVersion implements PlainJsonSerializable {
private final boolean bundledJdk;
private final int count;
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 bf5418c407..2ba42c9e8c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.ClusterNetworkTypes
@JsonpDeserializable
-public class ClusterNetworkTypes implements JsonpSerializable {
+public class ClusterNetworkTypes implements PlainJsonSerializable {
private final Map httpTypes;
private final Map transportTypes;
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 47e1b7688d..2d1e5818aa 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.ClusterNodeCount
@JsonpDeserializable
-public class ClusterNodeCount implements JsonpSerializable {
+public class ClusterNodeCount implements PlainJsonSerializable {
private final int coordinatingOnly;
private final int data;
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 b574410de9..95b3ebd674 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.PluginStats;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: cluster.stats.ClusterNodes
@JsonpDeserializable
-public class ClusterNodes implements JsonpSerializable {
+public class ClusterNodes implements PlainJsonSerializable {
private final ClusterNodeCount count;
private final Map discoveryTypes;
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 e32487c7cb..7446f51bef 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: cluster.stats.ClusterOperatingSystem
@JsonpDeserializable
-public class ClusterOperatingSystem implements JsonpSerializable {
+public class ClusterOperatingSystem implements PlainJsonSerializable {
private final int allocatedProcessors;
private final int availableProcessors;
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 5539afb74c..47562445bc 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterOperatingSystemArchitecture
@JsonpDeserializable
-public class ClusterOperatingSystemArchitecture implements JsonpSerializable {
+public class ClusterOperatingSystemArchitecture implements PlainJsonSerializable {
private final int count;
private final String 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 a9cdc1b36f..892a61ac32 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterOperatingSystemName
@JsonpDeserializable
-public class ClusterOperatingSystemName implements JsonpSerializable {
+public class ClusterOperatingSystemName implements PlainJsonSerializable {
private final int count;
private final String 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 879313400f..98c56c31a6 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterOperatingSystemPrettyName
@JsonpDeserializable
-public class ClusterOperatingSystemPrettyName implements JsonpSerializable {
+public class ClusterOperatingSystemPrettyName implements PlainJsonSerializable {
private final int count;
private final String prettyName;
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 9e683eedd0..46799262c8 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterProcess
@JsonpDeserializable
-public class ClusterProcess implements JsonpSerializable {
+public class ClusterProcess implements PlainJsonSerializable {
private final ClusterProcessCpu cpu;
private final ClusterProcessOpenFileDescriptors openFileDescriptors;
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 7629f6b8a2..72d58b111f 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterProcessCpu
@JsonpDeserializable
-public class ClusterProcessCpu implements JsonpSerializable {
+public class ClusterProcessCpu implements PlainJsonSerializable {
private final int 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 6521c75980..48f2e84314 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterProcessOpenFileDescriptors
@JsonpDeserializable
-public class ClusterProcessOpenFileDescriptors implements JsonpSerializable {
+public class ClusterProcessOpenFileDescriptors implements PlainJsonSerializable {
private final long avg;
private final long max;
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 b20b42cd8f..b485c9d94b 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterProcessor
@JsonpDeserializable
-public class ClusterProcessor implements JsonpSerializable {
+public class ClusterProcessor implements PlainJsonSerializable {
private final long count;
private final long current;
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 2f90f15a1a..baf8a19a3d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.ClusterShardMetrics
@JsonpDeserializable
-public class ClusterShardMetrics implements JsonpSerializable {
+public class ClusterShardMetrics implements PlainJsonSerializable {
private final double avg;
private final double max;
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 eaf77e7abb..374f7de853 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.FieldTypes
@JsonpDeserializable
-public class FieldTypes implements JsonpSerializable {
+public class FieldTypes implements PlainJsonSerializable {
private final String name;
private final int 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 6641db1353..8a21c8eebf 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: cluster.stats.FieldTypesMappings
@JsonpDeserializable
-public class FieldTypesMappings implements JsonpSerializable {
+public class FieldTypesMappings implements PlainJsonSerializable {
private final List fieldTypes;
private final List runtimeFieldTypes;
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 abf01c5c8b..85ab99af22 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.IndicesVersions
@JsonpDeserializable
-public class IndicesVersions implements JsonpSerializable {
+public class IndicesVersions implements PlainJsonSerializable {
private final int indexCount;
private final int primaryShardCount;
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 d79830ef0a..e17ebb71b3 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.NodePackagingType
@JsonpDeserializable
-public class NodePackagingType implements JsonpSerializable {
+public class NodePackagingType implements PlainJsonSerializable {
private final int count;
private final String 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 0e17eb5be9..231f6b7fc9 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: cluster.stats.OperatingSystemMemoryInfo
@JsonpDeserializable
-public class OperatingSystemMemoryInfo implements JsonpSerializable {
+public class OperatingSystemMemoryInfo implements PlainJsonSerializable {
private final long freeInBytes;
private final int freePercent;
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 fcff99de4c..624d69fb9c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: cluster.stats.RuntimeFieldTypes
@JsonpDeserializable
-public class RuntimeFieldTypes implements JsonpSerializable {
+public class RuntimeFieldTypes implements PlainJsonSerializable {
private final String name;
private final int count;
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 13cbc5a1d8..f53c1a93d2 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.bulk.BulkResponseItem;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.bulk.Response
@JsonpDeserializable
-public class BulkResponse implements JsonpSerializable {
+public class BulkResponse implements PlainJsonSerializable {
private final boolean errors;
private final List items;
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 dd2e47066a..eefdff36a4 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.transport.Endpoint;
@@ -58,7 +58,7 @@
*
*/
@JsonpDeserializable
-public class ClearScrollRequest extends RequestBase implements JsonpSerializable {
+public class ClearScrollRequest extends RequestBase implements PlainJsonSerializable {
private final List scrollId;
// ---------------------------------------------------------------------------------------------
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 017d435173..3bed54f6a7 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.clear_scroll.Response
@JsonpDeserializable
-public class ClearScrollResponse implements JsonpSerializable {
+public class ClearScrollResponse implements PlainJsonSerializable {
private final boolean succeeded;
private final int numFreed;
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 f382e3677b..811bf4429d 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -63,7 +63,7 @@
*
*/
@JsonpDeserializable
-public class CountRequest extends RequestBase implements JsonpSerializable {
+public class CountRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 05e477eafe..fdf9cacaf7 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _global.count.Response
@JsonpDeserializable
-public class CountResponse implements JsonpSerializable {
+public class CountResponse implements PlainJsonSerializable {
private final long count;
private final ShardStatistics 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 b29dce5680..c09b78b28d 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.Refresh;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -64,7 +64,7 @@
*
*/
-public class CreateRequest extends RequestBase implements JsonpSerializable {
+public class CreateRequest extends RequestBase implements PlainJsonSerializable {
private final String id;
private final String index;
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 67d6df63c7..5e973dba47 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Conflicts;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -69,7 +69,7 @@
*
*/
@JsonpDeserializable
-public class DeleteByQueryRequest extends RequestBase implements JsonpSerializable {
+public class DeleteByQueryRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfigParam source;
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 7f95532c2b..8c8a32d7bb 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
import org.opensearch.client.opensearch._types.Retries;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: _global.delete_by_query.Response
@JsonpDeserializable
-public class DeleteByQueryResponse implements JsonpSerializable {
+public class DeleteByQueryResponse implements PlainJsonSerializable {
@Nullable
private final Long batches;
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 bcf2c9eb79..43aa098af1 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.query_dsl.Operator;
@@ -63,7 +63,7 @@
*
*/
@JsonpDeserializable
-public class ExplainRequest extends RequestBase implements JsonpSerializable {
+public class ExplainRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfigParam source;
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 db36b5066e..71639b638f 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
@@ -39,11 +39,11 @@
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.NamedDeserializer;
import org.opensearch.client.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.InlineGet;
import org.opensearch.client.opensearch.core.explain.ExplanationDetail;
import org.opensearch.client.util.ApiTypeHelper;
@@ -53,7 +53,7 @@
// typedef: _global.explain.Response
@JsonpDeserializable
-public class ExplainResponse implements JsonpSerializable {
+public class ExplainResponse implements PlainJsonSerializable {
private final String index;
private final String id;
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 3800124290..7803eb4671 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -64,7 +64,7 @@
*
*/
@JsonpDeserializable
-public class FieldCapsRequest extends RequestBase implements JsonpSerializable {
+public class FieldCapsRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 ea3a5a5cc5..fadf403f59 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.field_caps.FieldCapability;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.field_caps.Response
@JsonpDeserializable
-public class FieldCapsResponse implements JsonpSerializable {
+public class FieldCapsResponse implements PlainJsonSerializable {
private final List indices;
private final Map> fields;
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 1a0bf28b8a..dce0b78c15 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.get_script_context.Context;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.get_script_context.Response
@JsonpDeserializable
-public class GetScriptContextResponse implements JsonpSerializable {
+public class GetScriptContextResponse implements PlainJsonSerializable {
private final List contexts;
// ---------------------------------------------------------------------------------------------
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 95886a42c6..c612091e60 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.get_script_languages.LanguageContext;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.get_script_languages.Response
@JsonpDeserializable
-public class GetScriptLanguagesResponse implements JsonpSerializable {
+public class GetScriptLanguagesResponse implements PlainJsonSerializable {
private final List languageContexts;
private final List typesAllowed;
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 c7c2868ad9..743b5966e8 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.StoredScript;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.get_script.Response
@JsonpDeserializable
-public class GetScriptResponse implements JsonpSerializable {
+public class GetScriptResponse implements PlainJsonSerializable {
private final String id;
private final boolean found;
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 c04020c082..33bd5199f0 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
@@ -38,10 +38,10 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.get_source.Response
@JsonpDeserializable
-public class GetSourceResponse implements JsonpSerializable {
+public class GetSourceResponse implements PlainJsonSerializable {
private final TDocument valueBody;
@Nullable
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 2479acd17d..85c5ba9988 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.OpType;
import org.opensearch.client.opensearch._types.Refresh;
@@ -62,7 +62,7 @@
*
*/
-public class IndexRequest extends RequestBase implements JsonpSerializable {
+public class IndexRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String id;
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 3133d4433b..b3d7637f5c 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch.core.mget.MultiGetOperation;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class MgetRequest extends RequestBase implements JsonpSerializable {
+public class MgetRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfigParam source;
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 c74c55ced7..5cc8612c56 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
@@ -40,11 +40,11 @@
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.NamedDeserializer;
import org.opensearch.client.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.mget.MultiGetResponseItem;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -53,7 +53,7 @@
// typedef: _global.mget.Response
@JsonpDeserializable
-public class MgetResponse implements JsonpSerializable {
+public class MgetResponse implements PlainJsonSerializable {
private final List> docs;
@Nullable
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 caa971a1fb..bbb8b6a70f 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.VersionType;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class MtermvectorsRequest extends RequestBase implements JsonpSerializable {
+public class MtermvectorsRequest extends RequestBase implements PlainJsonSerializable {
private final List docs;
@Nullable
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 d2ef648d00..e37793d0ae 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.mtermvectors.MultiTermVectorsResult;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.mtermvectors.Response
@JsonpDeserializable
-public class MtermvectorsResponse implements JsonpSerializable {
+public class MtermvectorsResponse implements PlainJsonSerializable {
private final List docs;
// ---------------------------------------------------------------------------------------------
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 787e18fa29..c6cbcdb6b5 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.StoredScript;
@@ -60,7 +60,7 @@
*
*/
@JsonpDeserializable
-public class PutScriptRequest extends RequestBase implements JsonpSerializable {
+public class PutScriptRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String context;
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 ca339ab2a4..1862b4d30a 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -64,7 +64,7 @@
*
*/
@JsonpDeserializable
-public class RankEvalRequest extends RequestBase implements JsonpSerializable {
+public class RankEvalRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 4d5a6dd747..35c7aead4c 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.rank_eval.RankEvalMetricDetail;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.rank_eval.Response
@JsonpDeserializable
-public class RankEvalResponse implements JsonpSerializable {
+public class RankEvalResponse implements PlainJsonSerializable {
private final double metricScore;
private final Map details;
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 49ae533cd7..94729d0256 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Conflicts;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -65,7 +65,7 @@
*
*/
@JsonpDeserializable
-public class ReindexRequest extends RequestBase implements JsonpSerializable {
+public class ReindexRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Conflicts conflicts;
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 225d1af6bd..f449db711f 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
import org.opensearch.client.opensearch._types.Retries;
import org.opensearch.client.opensearch._types.Time;
@@ -52,7 +52,7 @@
// typedef: _global.reindex.Response
@JsonpDeserializable
-public class ReindexResponse implements JsonpSerializable {
+public class ReindexResponse implements PlainJsonSerializable {
@Nullable
private final Long batches;
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 a1fde40637..d8e43cc967 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.reindex_rethrottle.ReindexNode;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.reindex_rethrottle.Response
@JsonpDeserializable
-public class ReindexRethrottleResponse implements JsonpSerializable {
+public class ReindexRethrottleResponse implements PlainJsonSerializable {
private final Map 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 a393df9135..2e738f2dc7 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.transport.Endpoint;
@@ -59,7 +59,7 @@
*
*/
@JsonpDeserializable
-public class RenderSearchTemplateRequest extends RequestBase implements JsonpSerializable {
+public class RenderSearchTemplateRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String file;
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 e0fe2d4176..add6f55400 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.render_search_template.Response
@JsonpDeserializable
-public class RenderSearchTemplateResponse implements JsonpSerializable {
+public class RenderSearchTemplateResponse implements PlainJsonSerializable {
private final Map templateOutput;
// ---------------------------------------------------------------------------------------------
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 57e2baf40d..e239a98ff1 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.InlineScript;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -58,7 +58,7 @@
*
*/
@JsonpDeserializable
-public class ScriptsPainlessExecuteRequest extends RequestBase implements JsonpSerializable {
+public class ScriptsPainlessExecuteRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String context;
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 7d3dc4cc30..5c9bdff959 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
@@ -39,12 +39,12 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -52,7 +52,7 @@
// typedef: _global.scripts_painless_execute.Response
@JsonpDeserializable
-public class ScriptsPainlessExecuteResponse implements JsonpSerializable {
+public class ScriptsPainlessExecuteResponse implements PlainJsonSerializable {
private final TResult result;
@Nullable
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 4535fda3f7..af79875890 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -58,7 +58,7 @@
*
*/
@JsonpDeserializable
-public class ScrollRequest extends RequestBase implements JsonpSerializable {
+public class ScrollRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Time scroll;
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 1d1016af1b..3b7166c1fc 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
@@ -43,9 +43,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.FieldValue;
@@ -60,7 +60,6 @@
import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
import org.opensearch.client.opensearch._types.query_dsl.Operator;
import org.opensearch.client.opensearch._types.query_dsl.Query;
-import org.opensearch.client.opensearch.core.SearchTemplateRequest.Builder;
import org.opensearch.client.opensearch.core.search.FieldCollapse;
import org.opensearch.client.opensearch.core.search.Highlight;
import org.opensearch.client.opensearch.core.search.Pit;
@@ -81,7 +80,7 @@
*
*/
@JsonpDeserializable
-public class SearchRequest extends RequestBase implements JsonpSerializable {
+public class SearchRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfig source;
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 f72a9f5785..10d28a4cf7 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.NodeAttributes;
import org.opensearch.client.opensearch._types.NodeShard;
import org.opensearch.client.opensearch.core.search_shards.ShardStoreIndex;
@@ -52,7 +52,7 @@
// typedef: _global.search_shards.Response
@JsonpDeserializable
-public class SearchShardsResponse implements JsonpSerializable {
+public class SearchShardsResponse implements PlainJsonSerializable {
private final Map nodes;
private final List> shards;
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 453219e5d2..a3a828794c 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
@@ -43,9 +43,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -64,7 +64,7 @@
*
*/
@JsonpDeserializable
-public class SearchTemplateRequest extends RequestBase implements JsonpSerializable {
+public class SearchTemplateRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 53669c4c1d..a87ffcee4d 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class TermsEnumRequest extends RequestBase implements JsonpSerializable {
+public class TermsEnumRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean caseInsensitive;
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 9e07c69a08..2909698699 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.terms_enum.Response
@JsonpDeserializable
-public class TermsEnumResponse implements JsonpSerializable {
+public class TermsEnumResponse implements PlainJsonSerializable {
private final ShardStatistics shards;
private final List terms;
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 5e3307f387..242ec4834a 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
@@ -42,11 +42,11 @@
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.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.VersionType;
@@ -65,7 +65,7 @@
*
*/
-public class TermvectorsRequest extends RequestBase implements JsonpSerializable {
+public class TermvectorsRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final TDocument doc;
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 b52a901f58..c644b5df7f 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.termvectors.TermVector;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.termvectors.Response
@JsonpDeserializable
-public class TermvectorsResponse implements JsonpSerializable {
+public class TermvectorsResponse implements PlainJsonSerializable {
private final boolean found;
private final String id;
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 0c8fe2f221..f10d6b4a6b 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Conflicts;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
@@ -71,7 +71,7 @@
*
*/
@JsonpDeserializable
-public class UpdateByQueryRequest extends RequestBase implements JsonpSerializable {
+public class UpdateByQueryRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfigParam source;
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 821bed0b73..1fc80b1523 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.BulkIndexByScrollFailure;
import org.opensearch.client.opensearch._types.Retries;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: _global.update_by_query.Response
@JsonpDeserializable
-public class UpdateByQueryResponse implements JsonpSerializable {
+public class UpdateByQueryResponse implements PlainJsonSerializable {
@Nullable
private final Long batches;
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 6cf3448af6..2b6d3ff20a 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.update_by_query_rethrottle.UpdateByQueryRethrottleNode;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.update_by_query_rethrottle.Response
@JsonpDeserializable
-public class UpdateByQueryRethrottleResponse implements JsonpSerializable {
+public class UpdateByQueryRethrottleResponse implements PlainJsonSerializable {
private final Map 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 7685604b83..861a70a0da 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
@@ -40,11 +40,11 @@
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.json.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.Refresh;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -65,7 +65,7 @@
*
*/
-public class UpdateRequest extends RequestBase implements JsonpSerializable {
+public class UpdateRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final SourceConfig source;
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 85cf013009..913da01e01 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
@@ -36,14 +36,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.VersionType;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.bulk.OperationBase
-public abstract class BulkOperationBase implements JsonpSerializable {
+public abstract class BulkOperationBase implements PlainJsonSerializable {
@Nullable
private final String id;
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 32bc0bb6b8..c0f21b9b06 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.opensearch._types.InlineGet;
import org.opensearch.client.opensearch._types.ShardStatistics;
@@ -53,7 +53,7 @@
// typedef: _global.bulk.ResponseItem
@JsonpDeserializable
-public class BulkResponseItem implements JsonpSerializable {
+public class BulkResponseItem implements PlainJsonSerializable {
// Single key dictionary
private final OperationType operationType;
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 95d0a9f3f4..9705692d5e 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
@@ -12,14 +12,14 @@
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.json.JsonpSerializer;
import org.opensearch.client.json.JsonpUtils;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Script;
import org.opensearch.client.opensearch.core.search.SourceConfig;
import org.opensearch.client.util.ObjectBuilder;
-public class UpdateOperationData implements JsonpSerializable {
+public class UpdateOperationData implements PlainJsonSerializable {
@Nullable
private final TDocument document;
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 8470299d76..319ae5a8a4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.explain.Explanation
@JsonpDeserializable
-public class Explanation implements JsonpSerializable {
+public class Explanation implements PlainJsonSerializable {
private final String description;
private final List details;
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 606a598fbf..d5828c8aca 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.explain.ExplanationDetail
@JsonpDeserializable
-public class ExplanationDetail implements JsonpSerializable {
+public class ExplanationDetail implements PlainJsonSerializable {
private final String description;
private final List details;
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 82c361fc8a..b98274e634 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _global.field_caps.FieldCapability
@JsonpDeserializable
-public class FieldCapability implements JsonpSerializable {
+public class FieldCapability implements PlainJsonSerializable {
private final boolean aggregatable;
private final List indices;
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 521218c19c..9eb71cbc67 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
@@ -40,18 +40,18 @@
import org.opensearch.client.json.JsonData;
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.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.get.GetResult
-public class GetResult implements JsonpSerializable {
+public class GetResult implements PlainJsonSerializable {
private final String index;
private final Map fields;
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 3c2e2eaf24..97b1135bf9 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.get_script_context.Context
@JsonpDeserializable
-public class Context implements JsonpSerializable {
+public class Context implements PlainJsonSerializable {
private final List methods;
private final String 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 5a15d7136d..ece6c52c23 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.get_script_context.ContextMethod
@JsonpDeserializable
-public class ContextMethod implements JsonpSerializable {
+public class ContextMethod implements PlainJsonSerializable {
private final String name;
private final String returnType;
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 b761b535ec..e50455d341 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.get_script_context.ContextMethodParam
@JsonpDeserializable
-public class ContextMethodParam implements JsonpSerializable {
+public class ContextMethodParam implements PlainJsonSerializable {
private final String name;
private final String 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 bf5fbe226f..c06e087a03 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.get_script_languages.LanguageContext
@JsonpDeserializable
-public class LanguageContext implements JsonpSerializable {
+public class LanguageContext implements PlainJsonSerializable {
private final List contexts;
private final String 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 74dd084717..572e2b33ed 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _global.mget.MultiGetError
@JsonpDeserializable
-public class MultiGetError implements JsonpSerializable {
+public class MultiGetError implements PlainJsonSerializable {
private final ErrorCause error;
private final String id;
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 6accd89974..ffe13340e2 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.VersionType;
import org.opensearch.client.opensearch.core.search.SourceConfig;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: _global.mget.Operation
@JsonpDeserializable
-public class MultiGetOperation implements JsonpSerializable {
+public class MultiGetOperation implements PlainJsonSerializable {
private final String id;
@Nullable
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 42e65b9012..315c76e93d 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
@@ -38,16 +38,16 @@
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.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.msearch.MultiSearchResult
-public abstract class MultiSearchResult implements JsonpSerializable {
+public abstract class MultiSearchResult implements PlainJsonSerializable {
private final long took;
private final List> 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 71d032111f..fb4ff1013d 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
@@ -41,15 +41,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ScriptField;
import org.opensearch.client.opensearch._types.SortOptions;
import org.opensearch.client.opensearch._types.aggregations.Aggregation;
import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
import org.opensearch.client.opensearch._types.query_dsl.Query;
-import org.opensearch.client.opensearch.core.SearchRequest.Builder;
import org.opensearch.client.opensearch.core.search.FieldCollapse;
import org.opensearch.client.opensearch.core.search.Highlight;
import org.opensearch.client.opensearch.core.search.Rescore;
@@ -63,7 +62,7 @@
// typedef: _global.msearch.MultisearchBody
@JsonpDeserializable
-public class MultisearchBody implements JsonpSerializable {
+public class MultisearchBody implements PlainJsonSerializable {
private final Map aggregations;
@Nullable
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 5f7cc4fedd..404e0aafac 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.SearchType;
import org.opensearch.client.util.ApiTypeHelper;
@@ -56,7 +56,7 @@
*
*/
@JsonpDeserializable
-public class MultisearchHeader implements JsonpSerializable {
+public class MultisearchHeader implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 74c1e6fb4e..0b71678691 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _global.msearch_template.TemplateConfig
@JsonpDeserializable
-public class TemplateConfig implements JsonpSerializable {
+public class TemplateConfig implements PlainJsonSerializable {
@Nullable
private final Boolean explain;
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 295c1d57aa..e679735eb5 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.VersionType;
import org.opensearch.client.opensearch.core.termvectors.Filter;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: _global.mtermvectors.Operation
@JsonpDeserializable
-public class MultiTermVectorsOperation implements JsonpSerializable {
+public class MultiTermVectorsOperation implements PlainJsonSerializable {
private final JsonData doc;
private final List fields;
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 34b5b06646..7e4f68c801 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.termvectors.TermVector;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.mtermvectors.TermVectorsResult
@JsonpDeserializable
-public class MultiTermVectorsResult implements JsonpSerializable {
+public class MultiTermVectorsResult implements PlainJsonSerializable {
private final boolean found;
private final String id;
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 7027720f6a..9bb8fa9bca 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
@@ -13,16 +13,16 @@
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.json.PlainJsonSerializable;
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;
@JsonpDeserializable
-public class CreatePitResponse implements JsonpSerializable {
+public class CreatePitResponse implements PlainJsonSerializable {
private final String pitId;
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 1b8ff592db..370886d4af 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
@@ -13,14 +13,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class DeletePitRecord implements JsonpSerializable {
+public class DeletePitRecord implements PlainJsonSerializable {
private final String pitId;
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 ad0a2812fa..6655628740 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
@@ -13,7 +13,7 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.transport.Endpoint;
@@ -26,7 +26,7 @@
* Deletes PITs on the OpenSearch cluster
*
*/
-public class DeletePitRequest extends RequestBase implements JsonpSerializable {
+public class DeletePitRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private List pitId;
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 38376d56d4..749c7a8a71 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
@@ -14,15 +14,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class DeletePitResponse implements JsonpSerializable {
+public class DeletePitResponse implements PlainJsonSerializable {
private final List pits;
private DeletePitResponse(Builder builder) {
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 330c9c4d46..ff25928b3e 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
@@ -14,15 +14,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class ListAllPitResponse implements JsonpSerializable {
+public class ListAllPitResponse implements PlainJsonSerializable {
private final List pits;
private ListAllPitResponse(Builder builder) {
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 1d30e0a83d..a080e9c552 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
@@ -13,14 +13,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class PitRecord implements JsonpSerializable {
+public class PitRecord implements PlainJsonSerializable {
private final String pitId;
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 59900e339c..7af90223d5 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.rank_eval.DocumentRating
@JsonpDeserializable
-public class DocumentRating implements JsonpSerializable {
+public class DocumentRating implements PlainJsonSerializable {
private final String id;
private final String index;
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 62817bbe5a..8bab677ed3 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.rank_eval.RankEvalHit
@JsonpDeserializable
-public class RankEvalHit implements JsonpSerializable {
+public class RankEvalHit implements PlainJsonSerializable {
private final String id;
private final String index;
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 e55cdeca50..e5ff73548d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.rank_eval.RankEvalHitItem
@JsonpDeserializable
-public class RankEvalHitItem implements JsonpSerializable {
+public class RankEvalHitItem implements PlainJsonSerializable {
private final RankEvalHit hit;
@Nullable
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 7ea001cbfa..04a8afc3c1 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.rank_eval.RankEvalMetric
@JsonpDeserializable
-public class RankEvalMetric implements JsonpSerializable {
+public class RankEvalMetric implements PlainJsonSerializable {
@Nullable
private final RankEvalMetricPrecision precision;
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 8531dddecc..f63c7dc356 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
@@ -36,13 +36,13 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.rank_eval.RankEvalMetricBase
-public abstract class RankEvalMetricBase implements JsonpSerializable {
+public abstract class RankEvalMetricBase implements PlainJsonSerializable {
@Nullable
private final Integer 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 e7b0b58bee..5eacd77b2c 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _global.rank_eval.RankEvalMetricDetail
@JsonpDeserializable
-public class RankEvalMetricDetail implements JsonpSerializable {
+public class RankEvalMetricDetail implements PlainJsonSerializable {
private final double metricScore;
private final List unratedDocs;
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 6a45c408e4..1c8c8b7a6e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.rank_eval.RankEvalQuery
@JsonpDeserializable
-public class RankEvalQuery implements JsonpSerializable {
+public class RankEvalQuery implements PlainJsonSerializable {
private final Query query;
@Nullable
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 8d3c23e5b1..e285cf9daf 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -51,7 +51,7 @@
// typedef: _global.rank_eval.RankEvalRequestItem
@JsonpDeserializable
-public class RankEvalRequestItem implements JsonpSerializable {
+public class RankEvalRequestItem implements PlainJsonSerializable {
private final String id;
@Nullable
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 579d79307b..616d23e0c4 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.rank_eval.UnratedDocument
@JsonpDeserializable
-public class UnratedDocument implements JsonpSerializable {
+public class UnratedDocument implements PlainJsonSerializable {
private final String id;
private final String 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 84717dc6d1..eaac2ed520 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.OpType;
import org.opensearch.client.opensearch._types.VersionType;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.reindex.Destination
@JsonpDeserializable
-public class Destination implements JsonpSerializable {
+public class Destination implements PlainJsonSerializable {
@Nullable
private final String index;
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 ada4adcb2c..ddbdf289aa 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _global.reindex.RemoteSource
@JsonpDeserializable
-public class RemoteSource implements JsonpSerializable {
+public class RemoteSource implements PlainJsonSerializable {
private final Time connectTimeout;
private final String host;
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 daec4c70ea..770b32077f 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.SlicedScroll;
import org.opensearch.client.opensearch._types.SortOptions;
import org.opensearch.client.opensearch._types.mapping.RuntimeField;
@@ -54,7 +54,7 @@
// typedef: _global.reindex.Source
@JsonpDeserializable
-public class Source implements JsonpSerializable {
+public class Source implements PlainJsonSerializable {
private final List index;
@Nullable
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 a96a09794e..521a049b29 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Retries;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: _global.reindex_rethrottle.ReindexStatus
@JsonpDeserializable
-public class ReindexStatus implements JsonpSerializable {
+public class ReindexStatus implements PlainJsonSerializable {
private final long batches;
private final long created;
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 4b3f4b44af..712edf09f4 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.reindex_rethrottle.ReindexTask
@JsonpDeserializable
-public class ReindexTask implements JsonpSerializable {
+public class ReindexTask implements PlainJsonSerializable {
private final String action;
private final boolean cancellable;
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 c82ff76620..0d2be48031 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.scripts_painless_execute.PainlessContextSetup
@JsonpDeserializable
-public class PainlessContextSetup implements JsonpSerializable {
+public class PainlessContextSetup implements PlainJsonSerializable {
private final JsonData document;
private final String index;
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 125b84176d..dd34131c6f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.AggregationBreakdown
@JsonpDeserializable
-public class AggregationBreakdown implements JsonpSerializable {
+public class AggregationBreakdown implements PlainJsonSerializable {
private final long buildAggregation;
private final long buildAggregationCount;
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 19403cf024..f77b8e6b45 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.AggregationProfile
@JsonpDeserializable
-public class AggregationProfile implements JsonpSerializable {
+public class AggregationProfile implements PlainJsonSerializable {
private final AggregationBreakdown breakdown;
private final String description;
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 ea7dd35929..50ba1c556a 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.AggregationProfileDebug
@JsonpDeserializable
-public class AggregationProfileDebug implements JsonpSerializable {
+public class AggregationProfileDebug implements PlainJsonSerializable {
@Nullable
private final Integer segmentsWithMultiValuedOrds;
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 db1f739ef3..dc82e4ac28 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.AggregationProfileDelegateDebug
@JsonpDeserializable
-public class AggregationProfileDelegateDebug implements JsonpSerializable {
+public class AggregationProfileDelegateDebug implements PlainJsonSerializable {
@Nullable
private final Integer segmentsWithDocCountField;
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 32e577f72d..7746802899 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.AggregationProfileDelegateDebugFilter
@JsonpDeserializable
-public class AggregationProfileDelegateDebugFilter implements JsonpSerializable {
+public class AggregationProfileDelegateDebugFilter implements PlainJsonSerializable {
@Nullable
private final Integer resultsFromMetadata;
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 33c813dbc0..12f191e152 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.Collector
@JsonpDeserializable
-public class Collector implements JsonpSerializable {
+public class Collector implements PlainJsonSerializable {
private final String name;
private final String reason;
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 dd29e7bd96..89b2751041 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.GeoHashPrecision;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.search._types.CompletionContext
@JsonpDeserializable
-public class CompletionContext implements JsonpSerializable {
+public class CompletionContext implements PlainJsonSerializable {
@Nullable
private final Double boost;
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 cb697e9334..5ed1460637 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
@@ -41,18 +41,18 @@
import org.opensearch.client.json.JsonData;
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.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.CompletionSuggestOption
-public class CompletionSuggestOption implements JsonpSerializable {
+public class CompletionSuggestOption implements PlainJsonSerializable {
@Nullable
private final Boolean collateMatch;
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 797696a76f..f1ca0fec6e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.SuggestMode;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.DirectGenerator
@JsonpDeserializable
-public class DirectGenerator implements JsonpSerializable {
+public class DirectGenerator implements PlainJsonSerializable {
private final String field;
@Nullable
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 10b0ac2de3..d9a6a68c9d 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.FetchProfile
@JsonpDeserializable
-public class FetchProfile implements JsonpSerializable {
+public class FetchProfile implements PlainJsonSerializable {
private final String type;
private final String description;
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 9a8ce17a88..4deb1f2ef3 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.FetchProfileBreakdown
@JsonpDeserializable
-public class FetchProfileBreakdown implements JsonpSerializable {
+public class FetchProfileBreakdown implements PlainJsonSerializable {
@Nullable
private final Integer loadStoredFields;
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 a6de778fa0..e8ff8736bc 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.FetchProfileDebug
@JsonpDeserializable
-public class FetchProfileDebug implements JsonpSerializable {
+public class FetchProfileDebug implements PlainJsonSerializable {
private final List storedFields;
@Nullable
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 cb21767229..ee14cb3d95 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.FieldCollapse
@JsonpDeserializable
-public class FieldCollapse implements JsonpSerializable {
+public class FieldCollapse implements PlainJsonSerializable {
private final String field;
private final List innerHits;
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 203f842d76..f3ffd26dd6 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -51,7 +51,7 @@
// typedef: _global.search._types.Highlight
@JsonpDeserializable
-public class Highlight implements JsonpSerializable {
+public class Highlight implements PlainJsonSerializable {
private final Map fields;
@Nullable
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 537cad7267..fdc67b5ce8 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.search._types.HighlightField
@JsonpDeserializable
-public class HighlightField implements JsonpSerializable {
+public class HighlightField implements PlainJsonSerializable {
@Nullable
private final String boundaryChars;
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 e39edf8bbc..eb54fe101b 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
@@ -41,11 +41,11 @@
import org.opensearch.client.json.JsonData;
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.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.core.explain.Explanation;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -53,7 +53,7 @@
// typedef: _global.search._types.Hit
-public class Hit implements JsonpSerializable {
+public class Hit implements PlainJsonSerializable {
private final String index;
private final String id;
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 0126da8699..e303fdaa01 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
@@ -39,17 +39,17 @@
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.ObjectBuilderDeserializer;
import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.HitsMetadata
-public class HitsMetadata implements JsonpSerializable {
+public class HitsMetadata implements PlainJsonSerializable {
@Nullable
private final TotalHits total;
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 14ecb45568..a39057c353 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ScriptField;
import org.opensearch.client.opensearch._types.SortOptions;
import org.opensearch.client.opensearch._types.query_dsl.FieldAndFormat;
@@ -53,7 +53,7 @@
// typedef: _global.search._types.InnerHits
@JsonpDeserializable
-public class InnerHits implements JsonpSerializable {
+public class InnerHits implements PlainJsonSerializable {
@Nullable
private final String name;
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 996acac607..e09fd961a4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.InnerHitsResult
@JsonpDeserializable
-public class InnerHitsResult implements JsonpSerializable {
+public class InnerHitsResult implements PlainJsonSerializable {
private final HitsMetadata hits;
// ---------------------------------------------------------------------------------------------
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 628a316e0a..09ef7cbb9c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.NestedIdentity
@JsonpDeserializable
-public class NestedIdentity implements JsonpSerializable {
+public class NestedIdentity implements PlainJsonSerializable {
private final String field;
private final int offset;
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 1c5864bcb7..566c7a8bc1 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _global.search._types.PhraseSuggestCollate
@JsonpDeserializable
-public class PhraseSuggestCollate implements JsonpSerializable {
+public class PhraseSuggestCollate implements PlainJsonSerializable {
private final Map params;
@Nullable
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 c6403eead0..d5e384ce75 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.PhraseSuggestCollateQuery
@JsonpDeserializable
-public class PhraseSuggestCollateQuery implements JsonpSerializable {
+public class PhraseSuggestCollateQuery implements PlainJsonSerializable {
@Nullable
private final String id;
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 7cb5427c00..609c6b926b 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.search._types.PhraseSuggestHighlight
@JsonpDeserializable
-public class PhraseSuggestHighlight implements JsonpSerializable {
+public class PhraseSuggestHighlight implements PlainJsonSerializable {
private final String postTag;
private final String preTag;
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 723788bc7e..0304ac893b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.PhraseSuggestOption
@JsonpDeserializable
-public class PhraseSuggestOption implements JsonpSerializable {
+public class PhraseSuggestOption implements PlainJsonSerializable {
private final String text;
@Nullable
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 990145915b..48dd6209c8 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
@@ -14,15 +14,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class Pit implements JsonpSerializable {
+public class Pit implements PlainJsonSerializable {
private final String id;
@Nullable
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 2a03bf448c..f0a6b2095e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.Profile
@JsonpDeserializable
-public class Profile implements JsonpSerializable {
+public class Profile implements PlainJsonSerializable {
private final List 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 3149ae2c3a..278b1d646f 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.search._types.QueryBreakdown
@JsonpDeserializable
-public class QueryBreakdown implements JsonpSerializable {
+public class QueryBreakdown implements PlainJsonSerializable {
private final long advance;
private final long advanceCount;
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 9c78a35ee6..3f34260327 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.QueryProfile
@JsonpDeserializable
-public class QueryProfile implements JsonpSerializable {
+public class QueryProfile implements PlainJsonSerializable {
private final QueryBreakdown breakdown;
private final String description;
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 1c76382df4..ec89327d73 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.Rescore
@JsonpDeserializable
-public class Rescore implements JsonpSerializable {
+public class Rescore implements PlainJsonSerializable {
private final RescoreQuery query;
@Nullable
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 ef930172ad..5436ee0ba4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.RescoreQuery
@JsonpDeserializable
-public class RescoreQuery implements JsonpSerializable {
+public class RescoreQuery implements PlainJsonSerializable {
private final Query query;
@Nullable
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 af3f8d4aa3..083d2e21b7 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.SearchProfile
@JsonpDeserializable
-public class SearchProfile implements JsonpSerializable {
+public class SearchProfile implements PlainJsonSerializable {
private final List collector;
private final List query;
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 e90e2536d9..5a0d042ebd 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
@@ -17,10 +17,10 @@
import org.opensearch.client.json.JsonData;
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.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ClusterStatistics;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.opensearch._types.aggregations.Aggregate;
@@ -30,7 +30,7 @@
//typedef: _global.search.SearchResult
-public abstract class SearchResult implements JsonpSerializable {
+public abstract class SearchResult implements PlainJsonSerializable {
private final long took;
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 9d369cef60..8ea0996825 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.ShardProfile
@JsonpDeserializable
-public class ShardProfile implements JsonpSerializable {
+public class ShardProfile implements PlainJsonSerializable {
private final List aggregations;
private final String id;
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 6d085167be..c17ddc36be 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.search._types.SourceFilter
@JsonpDeserializable
-public class SourceFilter implements JsonpSerializable {
+public class SourceFilter implements PlainJsonSerializable {
private final List excludes;
private final List includes;
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 5df148c0b4..f42acd9993 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
@@ -35,14 +35,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.Suggest
-public abstract class SuggestBase implements JsonpSerializable {
+public abstract class SuggestBase implements PlainJsonSerializable {
private final int length;
private final int offset;
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 bd3651d74e..63e54b2ebe 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.search._types.SuggestFuzziness
@JsonpDeserializable
-public class SuggestFuzziness implements JsonpSerializable {
+public class SuggestFuzziness implements PlainJsonSerializable {
private final String fuzziness;
private final int minLength;
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 2cfe2a14e2..844f30d953 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: _global.search._types.Suggester
@JsonpDeserializable
-public class Suggester implements JsonpSerializable {
+public class Suggester implements PlainJsonSerializable {
private final Map suggesters;
@Nullable
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 029fe2a879..2ac702c9b3 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
@@ -36,14 +36,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.search._types.SuggesterBase
-public abstract class SuggesterBase implements JsonpSerializable {
+public abstract class SuggesterBase implements PlainJsonSerializable {
private final String field;
@Nullable
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 5658a5cddf..f24b5e5db7 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.search._types.TermSuggestOption
@JsonpDeserializable
-public class TermSuggestOption implements JsonpSerializable {
+public class TermSuggestOption implements PlainJsonSerializable {
private final String text;
@Nullable
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 8d43610809..8ede3bb67d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.search._types.TotalHits
@JsonpDeserializable
-public class TotalHits implements JsonpSerializable {
+public class TotalHits implements PlainJsonSerializable {
private final TotalHitsRelation relation;
private final long value;
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 532055ebc1..661d0ceaca 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: _global.search_shards.ShardStoreIndex
@JsonpDeserializable
-public class ShardStoreIndex implements JsonpSerializable {
+public class ShardStoreIndex implements PlainJsonSerializable {
private final List aliases;
@Nullable
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 e1008aa068..4ba00c790c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: _global.termvectors.FieldStatistics
@JsonpDeserializable
-public class FieldStatistics implements JsonpSerializable {
+public class FieldStatistics implements PlainJsonSerializable {
private final int docCount;
private final long sumDocFreq;
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 3c7f915bd7..8de89f651d 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: _global.termvectors.Filter
@JsonpDeserializable
-public class Filter implements JsonpSerializable {
+public class Filter implements PlainJsonSerializable {
@Nullable
private final Integer maxDocFreq;
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 733704de66..2e627fe3f0 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: _global.termvectors.Term
@JsonpDeserializable
-public class Term implements JsonpSerializable {
+public class Term implements PlainJsonSerializable {
@Nullable
private final Integer docFreq;
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 55b7f0aeff..eaeb37fd5e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.termvectors.TermVector
@JsonpDeserializable
-public class TermVector implements JsonpSerializable {
+public class TermVector implements PlainJsonSerializable {
private final FieldStatistics fieldStatistics;
private final Map 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 7ebd429df1..742a5739b6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: _global.termvectors.Token
@JsonpDeserializable
-public class Token implements JsonpSerializable {
+public class Token implements PlainJsonSerializable {
@Nullable
private final Integer endOffset;
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 a0defeb65f..31d1171432 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.dangling_indices.list_dangling_indices.DanglingIndex;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: dangling_indices.list_dangling_indices.Response
@JsonpDeserializable
-public class ListDanglingIndicesResponse implements JsonpSerializable {
+public class ListDanglingIndicesResponse implements PlainJsonSerializable {
private final List danglingIndices;
// ---------------------------------------------------------------------------------------------
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 c8781c2b3e..b893eb9946 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: dangling_indices.list_dangling_indices.DanglingIndex
@JsonpDeserializable
-public class DanglingIndex implements JsonpSerializable {
+public class DanglingIndex implements PlainJsonSerializable {
private final String indexName;
private final String indexUuid;
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 aae7f5355d..cc89ac9846 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: features._types.Feature
@JsonpDeserializable
-public class Feature implements JsonpSerializable {
+public class Feature implements PlainJsonSerializable {
private final String name;
private final String description;
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 65161b0e88..0cdf1edfc0 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: features.get_features.Response
@JsonpDeserializable
-public class GetFeaturesResponse implements JsonpSerializable {
+public class GetFeaturesResponse implements PlainJsonSerializable {
private final List features;
// ---------------------------------------------------------------------------------------------
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 3ba6108dcf..9fb01f5230 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: features.reset_features.Response
@JsonpDeserializable
-public class ResetFeaturesResponse implements JsonpSerializable {
+public class ResetFeaturesResponse implements PlainJsonSerializable {
private final List features;
// ---------------------------------------------------------------------------------------------
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 3297490e23..075e7d9885 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices._types.Alias
@JsonpDeserializable
-public class Alias implements JsonpSerializable {
+public class Alias implements PlainJsonSerializable {
@Nullable
private final Query filter;
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 cad15ee5cf..eeb2c7e956 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices._types.AliasDefinition
@JsonpDeserializable
-public class AliasDefinition implements JsonpSerializable {
+public class AliasDefinition implements PlainJsonSerializable {
@Nullable
private final Query filter;
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 f035939058..464c2fdc3b 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.analysis.CharFilter;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class AnalyzeRequest extends RequestBase implements JsonpSerializable {
+public class AnalyzeRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final String analyzer;
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 f977af5085..8c46aad120 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.analyze.AnalyzeDetail;
import org.opensearch.client.opensearch.indices.analyze.AnalyzeToken;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: indices.analyze.Response
@JsonpDeserializable
-public class AnalyzeResponse implements JsonpSerializable {
+public class AnalyzeResponse implements PlainJsonSerializable {
@Nullable
private final AnalyzeDetail detail;
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 b81df1dceb..980afd4fa9 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class CloneIndexRequest extends RequestBase implements JsonpSerializable {
+public class CloneIndexRequest extends RequestBase implements PlainJsonSerializable {
private final Map aliases;
private final String index;
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 512f0e77f9..236d52d700 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class CreateIndexRequest extends RequestBase implements JsonpSerializable {
+public class CreateIndexRequest extends RequestBase implements PlainJsonSerializable {
private final Map aliases;
private final String index;
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 dc51f2ee51..1773f5e9e4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.create.Response
@JsonpDeserializable
-public class CreateIndexResponse implements JsonpSerializable {
+public class CreateIndexResponse implements PlainJsonSerializable {
private final String index;
private final boolean shardsAcknowledged;
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 dc8ad5b11e..6feb358992 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.DataStream
@JsonpDeserializable
-public class DataStream implements JsonpSerializable {
+public class DataStream implements PlainJsonSerializable {
@Nullable
private final Boolean hidden;
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 f07a73743a..335a67d022 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
@@ -13,16 +13,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.DataStreamIndexInfo
@JsonpDeserializable
-public class DataStreamIndexInfo implements JsonpSerializable {
+public class DataStreamIndexInfo implements PlainJsonSerializable {
private final String indexName;
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 73de13bc22..fe359d54af 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
@@ -14,9 +14,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.HealthStatus;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -25,7 +25,7 @@
// typedef: indices._types.DataStreamInfo
@JsonpDeserializable
-public class DataStreamInfo implements JsonpSerializable {
+public class DataStreamInfo implements PlainJsonSerializable {
private final String name;
private final DataStreamTimestampField timestampField;
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 b056babcd7..8f04758b8d 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
@@ -14,9 +14,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -24,7 +24,7 @@
// typedef: indices._types.DataStreamStats
@JsonpDeserializable
-public class DataStreamStats implements JsonpSerializable {
+public class DataStreamStats implements PlainJsonSerializable {
private final String dataStream;
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 fb10aa0748..7d015b5558 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
@@ -14,16 +14,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.DataStreamTimestampField
@JsonpDeserializable
-public class DataStreamTimestampField implements JsonpSerializable {
+public class DataStreamTimestampField implements PlainJsonSerializable {
@Nullable
private final String name;
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 02babd00eb..c646cc90de 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
@@ -15,9 +15,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -26,7 +26,7 @@
// typedef: indices.data_streams_stats.Response
@JsonpDeserializable
-public class DataStreamsStatsResponse implements JsonpSerializable {
+public class DataStreamsStatsResponse implements PlainJsonSerializable {
private final ShardStatistics shards;
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 3af03fdf6b..d7bed4f65d 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
@@ -38,7 +38,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -46,7 +46,7 @@
// typedef: indices.disk_usage.Response
@JsonpDeserializable
-public class DiskUsageResponse implements JsonpSerializable {
+public class DiskUsageResponse implements PlainJsonSerializable {
private final JsonData valueBody;
// ---------------------------------------------------------------------------------------------
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 55018efcb4..c9e307a46d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices._types.FielddataFrequencyFilter
@JsonpDeserializable
-public class FielddataFrequencyFilter implements JsonpSerializable {
+public class FielddataFrequencyFilter implements PlainJsonSerializable {
private final double max;
private final double min;
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 4a52e8bf90..cfd1fd9e58 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
@@ -14,9 +14,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -24,7 +24,7 @@
// typedef: indices.get_data_stream.Response
@JsonpDeserializable
-public class GetDataStreamResponse implements JsonpSerializable {
+public class GetDataStreamResponse implements PlainJsonSerializable {
private final List dataStreams;
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 21b0d63c71..709b613233 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.get_index_template.IndexTemplateItem;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.get_index_template.Response
@JsonpDeserializable
-public class GetIndexTemplateResponse implements JsonpSerializable {
+public class GetIndexTemplateResponse implements PlainJsonSerializable {
private final List indexTemplates;
// ---------------------------------------------------------------------------------------------
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 0c11d1452d..a290895165 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.get_upgrade.Response
@JsonpDeserializable
-public class GetUpgradeResponse implements JsonpSerializable {
+public class GetUpgradeResponse implements PlainJsonSerializable {
private final List overlapping;
@Nullable
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 99d9897cdc..45adedb410 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexRouting
@JsonpDeserializable
-public class IndexRouting implements JsonpSerializable {
+public class IndexRouting implements PlainJsonSerializable {
@Nullable
private final IndexRoutingAllocation allocation;
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 a934ce3600..2dedd025e6 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexRoutingAllocation
@JsonpDeserializable
-public class IndexRoutingAllocation implements JsonpSerializable {
+public class IndexRoutingAllocation implements PlainJsonSerializable {
@Nullable
private final IndexRoutingAllocationOptions enable;
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 5a2350132a..7a90edd043 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexRoutingAllocationDisk
@JsonpDeserializable
-public class IndexRoutingAllocationDisk implements JsonpSerializable {
+public class IndexRoutingAllocationDisk implements PlainJsonSerializable {
@Nullable
private final Boolean thresholdEnabled;
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 36dbdbee4b..93255ae682 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexRoutingAllocationInclude
@JsonpDeserializable
-public class IndexRoutingAllocationInclude implements JsonpSerializable {
+public class IndexRoutingAllocationInclude implements PlainJsonSerializable {
@Nullable
private final String tierPreference;
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 2a63777e11..1c447de0df 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexRoutingAllocationInitialRecovery
@JsonpDeserializable
-public class IndexRoutingAllocationInitialRecovery implements JsonpSerializable {
+public class IndexRoutingAllocationInitialRecovery implements PlainJsonSerializable {
@Nullable
private final String id;
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 70e7c2499e..85782c3ed7 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices._types.IndexRoutingRebalance
@JsonpDeserializable
-public class IndexRoutingRebalance implements JsonpSerializable {
+public class IndexRoutingRebalance implements PlainJsonSerializable {
private final IndexRoutingRebalanceOptions enable;
// ---------------------------------------------------------------------------------------------
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 f651d8dc14..0d67016c69 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices._types.IndexSegmentSort
@JsonpDeserializable
-public class IndexSegmentSort implements JsonpSerializable {
+public class IndexSegmentSort implements PlainJsonSerializable {
private final List field;
private final List order;
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 bea892babf..baa92c0efd 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices._types.IndexSettingBlocks
@JsonpDeserializable
-public class IndexSettingBlocks implements JsonpSerializable {
+public class IndexSettingBlocks implements PlainJsonSerializable {
@Nullable
private final Boolean readOnly;
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 783a07c884..9e68b6fbcc 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: indices._types.IndexSettings
@JsonpDeserializable
-public class IndexSettings implements JsonpSerializable {
+public class IndexSettings implements PlainJsonSerializable {
@Nullable
private final IndexSettings index;
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 1e9148849d..834cdd47ca 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.analysis.Analyzer;
import org.opensearch.client.opensearch._types.analysis.CharFilter;
import org.opensearch.client.opensearch._types.analysis.Normalizer;
@@ -54,7 +54,7 @@
// typedef: indices._types.IndexSettingsAnalysis
@JsonpDeserializable
-public class IndexSettingsAnalysis implements JsonpSerializable {
+public class IndexSettingsAnalysis implements PlainJsonSerializable {
private final Map analyzer;
private final Map charFilter;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsIndexing.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsIndexing.java
index 2a37b52df2..19eeebb430 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsIndexing.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsIndexing.java
@@ -35,12 +35,17 @@
import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.opensearch.client.json.*;
+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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexSettingsIndexing implements JsonpSerializable {
+public class IndexSettingsIndexing implements PlainJsonSerializable {
@Nullable
private final IndexingSlowlog slowlog;
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 5b369d8e27..055d440d5e 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
@@ -14,14 +14,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexSettingsMapping implements JsonpSerializable {
+public class IndexSettingsMapping implements PlainJsonSerializable {
@Nullable
private final IndexSettingsMappingLimit totalFields;
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 fce4e94c77..ef45bf0aa3 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
@@ -14,14 +14,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexSettingsMappingLimit implements JsonpSerializable {
+public class IndexSettingsMappingLimit implements PlainJsonSerializable {
@Nullable
private final Long limit;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsSearch.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsSearch.java
index c32d7ce6a8..1bb735e921 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsSearch.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexSettingsSearch.java
@@ -35,12 +35,17 @@
import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.opensearch.client.json.*;
+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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexSettingsSearch implements JsonpSerializable {
+public class IndexSettingsSearch implements PlainJsonSerializable {
@Nullable
private final SearchIdle idle;
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 615b320cc2..d24e42858c 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: indices._types.IndexState
@JsonpDeserializable
-public class IndexState implements JsonpSerializable {
+public class IndexState implements PlainJsonSerializable {
private final Map aliases;
@Nullable
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 4e03470d69..b6a6f9d315 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices._types.IndexVersioning
@JsonpDeserializable
-public class IndexVersioning implements JsonpSerializable {
+public class IndexVersioning implements PlainJsonSerializable {
private final String created;
// ---------------------------------------------------------------------------------------------
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlog.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlog.java
index 8e00dd626b..68ae5b3063 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlog.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlog.java
@@ -38,14 +38,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexingSlowlog implements JsonpSerializable {
+public class IndexingSlowlog implements PlainJsonSerializable {
@Nullable
private final String level;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlogThresholds.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlogThresholds.java
index 964625102f..5d3e3322be 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlogThresholds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/IndexingSlowlogThresholds.java
@@ -38,14 +38,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class IndexingSlowlogThresholds implements JsonpSerializable {
+public class IndexingSlowlogThresholds implements PlainJsonSerializable {
@Nullable
private final SlowlogThresholdLevels index;
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 135e6de736..e2f40cb537 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.opensearch.indices.stats.IndicesStats;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: indices.stats.Response
@JsonpDeserializable
-public class IndicesStatsResponse implements JsonpSerializable {
+public class IndicesStatsResponse implements PlainJsonSerializable {
private final Map indices;
private final ShardStatistics shards;
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 45f8c5f423..222a37bea1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices._types.NumericFielddata
@JsonpDeserializable
-public class NumericFielddata implements JsonpSerializable {
+public class NumericFielddata implements PlainJsonSerializable {
private final NumericFielddataFormat format;
// ---------------------------------------------------------------------------------------------
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 6224720570..2ba73f5aa9 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices._types.OverlappingIndexTemplate
@JsonpDeserializable
-public class OverlappingIndexTemplate implements JsonpSerializable {
+public class OverlappingIndexTemplate implements PlainJsonSerializable {
private final String name;
private final List indexPatterns;
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 7fd574d7b3..ee78e89b7a 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class PutAliasRequest extends RequestBase implements JsonpSerializable {
+public class PutAliasRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Query filter;
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 77cbb67391..b67132db45 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch.indices.put_index_template.IndexTemplateMapping;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class PutIndexTemplateRequest extends RequestBase implements JsonpSerializable {
+public class PutIndexTemplateRequest extends RequestBase implements PlainJsonSerializable {
private final Map meta;
private final List composedOf;
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 354737287c..aa71f98e2c 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
@@ -42,7 +42,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -60,7 +60,7 @@
*
*/
@JsonpDeserializable
-public class PutIndicesSettingsRequest extends RequestBase implements JsonpSerializable {
+public class PutIndicesSettingsRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allowNoIndices;
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 04d43ff12f..98229cf9a8 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
@@ -43,9 +43,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -69,7 +69,7 @@
*
*/
@JsonpDeserializable
-public class PutMappingRequest extends RequestBase implements JsonpSerializable {
+public class PutMappingRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final FieldNamesField fieldNames;
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 ce0087b4ba..408cdd58bc 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class PutTemplateRequest extends RequestBase implements JsonpSerializable {
+public class PutTemplateRequest extends RequestBase implements PlainJsonSerializable {
private final Map aliases;
@Nullable
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 76871e26ac..3d42e6eaaa 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexAliasItem;
import org.opensearch.client.opensearch.indices.resolve_index.ResolveIndexItem;
import org.opensearch.client.util.ApiTypeHelper;
@@ -50,7 +50,7 @@
// typedef: indices.resolve_index.Response
@JsonpDeserializable
-public class ResolveIndexResponse implements JsonpSerializable {
+public class ResolveIndexResponse implements PlainJsonSerializable {
private final List indices;
private final List 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 1f5b973d71..d85cbd61ce 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -64,7 +64,7 @@
*
*/
@JsonpDeserializable
-public class RolloverRequest extends RequestBase implements JsonpSerializable {
+public class RolloverRequest extends RequestBase implements PlainJsonSerializable {
private final String alias;
private final Map aliases;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchIdle.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchIdle.java
index 47a6ed7f5c..6ebc92ebfe 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchIdle.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchIdle.java
@@ -35,13 +35,18 @@
import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.opensearch.client.json.*;
+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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class SearchIdle implements JsonpSerializable {
+public class SearchIdle implements PlainJsonSerializable {
@Nullable
private final Time after;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlog.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlog.java
index 33980acf33..7cc720ace6 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlog.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlog.java
@@ -35,12 +35,17 @@
import jakarta.json.stream.JsonGenerator;
import java.util.function.Function;
import javax.annotation.Nullable;
-import org.opensearch.client.json.*;
+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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class SearchSlowlog implements JsonpSerializable {
+public class SearchSlowlog implements PlainJsonSerializable {
@Nullable
private final String level;
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlogThresholds.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlogThresholds.java
index 6f7dfe9456..2399ce4908 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlogThresholds.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SearchSlowlogThresholds.java
@@ -38,14 +38,14 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class SearchSlowlogThresholds implements JsonpSerializable {
+public class SearchSlowlogThresholds implements PlainJsonSerializable {
@Nullable
private final SlowlogThresholdLevels query;
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 a6824ab753..a9bef40235 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.opensearch.indices.segments.IndexSegment;
import org.opensearch.client.util.ApiTypeHelper;
@@ -50,7 +50,7 @@
// typedef: indices.segments.Response
@JsonpDeserializable
-public class SegmentsResponse implements JsonpSerializable {
+public class SegmentsResponse implements PlainJsonSerializable {
private final Map indices;
private final ShardStatistics shards;
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 77550b3f8c..4466c02edd 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.shard_stores.IndicesShardStores;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.shard_stores.Response
@JsonpDeserializable
-public class ShardStoresResponse implements JsonpSerializable {
+public class ShardStoresResponse implements PlainJsonSerializable {
private final Map 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 802704f857..c7e8c51770 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class ShrinkRequest extends RequestBase implements JsonpSerializable {
+public class ShrinkRequest extends RequestBase implements PlainJsonSerializable {
private final Map aliases;
private final String 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 f750910f80..31ac22dec3 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -63,7 +63,7 @@
*
*/
@JsonpDeserializable
-public class SimulateIndexTemplateRequest extends RequestBase implements JsonpSerializable {
+public class SimulateIndexTemplateRequest extends RequestBase implements PlainJsonSerializable {
private final Map meta;
@Nullable
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 610da404cb..49ce178988 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
@@ -40,7 +40,7 @@
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.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -58,7 +58,7 @@
*
*/
@JsonpDeserializable
-public class SimulateTemplateRequest extends RequestBase implements JsonpSerializable {
+public class SimulateTemplateRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean create;
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 9d75d95267..1722c85c63 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.simulate_template.Template;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: indices.simulate_template.Response
@JsonpDeserializable
-public class SimulateTemplateResponse implements JsonpSerializable {
+public class SimulateTemplateResponse implements PlainJsonSerializable {
private final Template template;
// ---------------------------------------------------------------------------------------------
diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SlowlogThresholdLevels.java b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SlowlogThresholdLevels.java
index 2534f75366..ec7d322f35 100644
--- a/java-client/src/main/java/org/opensearch/client/opensearch/indices/SlowlogThresholdLevels.java
+++ b/java-client/src/main/java/org/opensearch/client/opensearch/indices/SlowlogThresholdLevels.java
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices._types.SlowlogTresholdLevels
@JsonpDeserializable
-public class SlowlogThresholdLevels implements JsonpSerializable {
+public class SlowlogThresholdLevels implements PlainJsonSerializable {
@Nullable
private final Time warn;
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 7c5310c466..c0a7f9053c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices._types.SoftDeletes
@JsonpDeserializable
-public class SoftDeletes implements JsonpSerializable {
+public class SoftDeletes implements PlainJsonSerializable {
private final boolean 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 97c3b8c941..8635a6d5b4 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -62,7 +62,7 @@
*
*/
@JsonpDeserializable
-public class SplitRequest extends RequestBase implements JsonpSerializable {
+public class SplitRequest extends RequestBase implements PlainJsonSerializable {
private final Map aliases;
private final String 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 c102ab266e..ceb905e844 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -52,7 +52,7 @@
// typedef: indices._types.TemplateMapping
@JsonpDeserializable
-public class TemplateMapping implements JsonpSerializable {
+public class TemplateMapping implements PlainJsonSerializable {
private final Map aliases;
private final List indexPatterns;
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 1009e61661..57467d2919 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
@@ -14,15 +14,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@JsonpDeserializable
-public class Translog implements JsonpSerializable {
+public class Translog implements PlainJsonSerializable {
@Nullable
private final String durability;
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 6c8c5b1f24..a9e3d29d0c 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class UpdateAliasesRequest extends RequestBase implements JsonpSerializable {
+public class UpdateAliasesRequest extends RequestBase implements PlainJsonSerializable {
private final List actions;
@Deprecated
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 fee5c1e527..2446f53dd2 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.ExpandWildcard;
import org.opensearch.client.opensearch._types.RequestBase;
@@ -63,7 +63,7 @@
*
*/
@JsonpDeserializable
-public class ValidateQueryRequest extends RequestBase implements JsonpSerializable {
+public class ValidateQueryRequest extends RequestBase implements PlainJsonSerializable {
@Nullable
private final Boolean allShards;
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 5bc71ccf0b..af16f7c178 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.opensearch.indices.validate_query.IndicesValidationExplanation;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: indices.validate_query.Response
@JsonpDeserializable
-public class ValidateQueryResponse implements JsonpSerializable {
+public class ValidateQueryResponse implements PlainJsonSerializable {
private final List explanations;
@Nullable
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 e7e48748c5..af21361b93 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.add_block.IndicesBlockStatus
@JsonpDeserializable
-public class IndicesBlockStatus implements JsonpSerializable {
+public class IndicesBlockStatus implements PlainJsonSerializable {
private final String name;
private final boolean 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 f79787c819..21caa7e48a 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.analyze.AnalyzeDetail
@JsonpDeserializable
-public class AnalyzeDetail implements JsonpSerializable {
+public class AnalyzeDetail implements PlainJsonSerializable {
@Nullable
private final AnalyzerDetail analyzer;
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 d554157a7d..64ef1ff083 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.analyze.AnalyzeToken
@JsonpDeserializable
-public class AnalyzeToken implements JsonpSerializable {
+public class AnalyzeToken implements PlainJsonSerializable {
private final long endOffset;
private final long position;
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 e569133020..bd1b4d4585 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.analyze.AnalyzerDetail
@JsonpDeserializable
-public class AnalyzerDetail implements JsonpSerializable {
+public class AnalyzerDetail implements PlainJsonSerializable {
private final String name;
private final List 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 eb1656fe68..7f8fa6c61f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.analyze.CharFilterDetail
@JsonpDeserializable
-public class CharFilterDetail implements JsonpSerializable {
+public class CharFilterDetail implements PlainJsonSerializable {
private final List filteredText;
private final String 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 906402720a..b7ac17bfb4 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.analyze.ExplainAnalyzeToken
@JsonpDeserializable
-public class ExplainAnalyzeToken implements JsonpSerializable {
+public class ExplainAnalyzeToken implements PlainJsonSerializable {
private final String bytes;
private final long endOffset;
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 9683a4aae2..3a6a9c0c29 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.analyze.TokenDetail
@JsonpDeserializable
-public class TokenDetail implements JsonpSerializable {
+public class TokenDetail implements PlainJsonSerializable {
private final String name;
private final List 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 2ef1d4c2aa..4be8f6a5db 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.close.CloseIndexResult
@JsonpDeserializable
-public class CloseIndexResult implements JsonpSerializable {
+public class CloseIndexResult implements PlainJsonSerializable {
private final boolean closed;
private final Map 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 9db2ea7d4a..f8fa17239d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardFailure;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.close.CloseShardResult
@JsonpDeserializable
-public class CloseShardResult implements JsonpSerializable {
+public class CloseShardResult implements PlainJsonSerializable {
private final List 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 e05bb9c968..7cc67a7562 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.AliasDefinition;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.get_alias.IndexAliases
@JsonpDeserializable
-public class IndexAliases implements JsonpSerializable {
+public class IndexAliases implements PlainJsonSerializable {
private final Map 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 6172bdc937..1ab0149f1c 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.FieldMapping;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -51,7 +51,7 @@
// typedef: indices.get_field_mapping.TypeFieldMappings
@JsonpDeserializable
-public class TypeFieldMappings implements JsonpSerializable {
+public class TypeFieldMappings implements PlainJsonSerializable {
private final Map 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 2c460ab0e5..cebcb16192 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -51,7 +51,7 @@
// typedef: indices.get_index_template.IndexTemplate
@JsonpDeserializable
-public class IndexTemplate implements JsonpSerializable {
+public class IndexTemplate implements PlainJsonSerializable {
private final List indexPatterns;
private final List composedOf;
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 07bff447fb..f61d16e8ac 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.get_index_template.IndexTemplateItem
@JsonpDeserializable
-public class IndexTemplateItem implements JsonpSerializable {
+public class IndexTemplateItem implements PlainJsonSerializable {
private final String name;
private final IndexTemplate indexTemplate;
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 ebe223d121..c6412b4d36 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.opensearch.indices.Alias;
import org.opensearch.client.util.ApiTypeHelper;
@@ -52,7 +52,7 @@
// typedef: indices.get_index_template.IndexTemplateSummary
@JsonpDeserializable
-public class IndexTemplateSummary implements JsonpSerializable {
+public class IndexTemplateSummary implements PlainJsonSerializable {
private final Map aliases;
@Nullable
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 fefaa61d20..b7ccf034a9 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.get_mapping.IndexMappingRecord
@JsonpDeserializable
-public class IndexMappingRecord implements JsonpSerializable {
+public class IndexMappingRecord implements PlainJsonSerializable {
@Nullable
private final TypeMapping item;
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 b2b182bd73..a32aac2ad9 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.opensearch.indices.Alias;
import org.opensearch.client.opensearch.indices.IndexSettings;
@@ -52,7 +52,7 @@
// typedef: indices.put_index_template.IndexTemplateMapping
@JsonpDeserializable
-public class IndexTemplateMapping implements JsonpSerializable {
+public class IndexTemplateMapping implements PlainJsonSerializable {
private final Map aliases;
@Nullable
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 40e0d7b358..0c3ba07c18 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.recovery.FileDetails
@JsonpDeserializable
-public class FileDetails implements JsonpSerializable {
+public class FileDetails implements PlainJsonSerializable {
private final long length;
private final String name;
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 84472fa161..858ee50852 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.recovery.RecoveryBytes
@JsonpDeserializable
-public class RecoveryBytes implements JsonpSerializable {
+public class RecoveryBytes implements PlainJsonSerializable {
private final String percent;
@Nullable
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 8b08e99a5c..023672e241 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.recovery.RecoveryFiles
@JsonpDeserializable
-public class RecoveryFiles implements JsonpSerializable {
+public class RecoveryFiles implements PlainJsonSerializable {
private final List details;
private final String percent;
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 44d573e7f1..963d86fc5a 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.recovery.RecoveryIndexStatus
@JsonpDeserializable
-public class RecoveryIndexStatus implements JsonpSerializable {
+public class RecoveryIndexStatus implements PlainJsonSerializable {
@Nullable
private final RecoveryBytes bytes;
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 bed827725f..e881cae9ec 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: indices.recovery.RecoveryOrigin
@JsonpDeserializable
-public class RecoveryOrigin implements JsonpSerializable {
+public class RecoveryOrigin implements PlainJsonSerializable {
@Nullable
private final String hostname;
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 5f712c2f43..1918f464b6 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.recovery.RecoveryStartStatus
@JsonpDeserializable
-public class RecoveryStartStatus implements JsonpSerializable {
+public class RecoveryStartStatus implements PlainJsonSerializable {
private final long checkIndexTime;
private final String totalTimeInMillis;
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 1b2324515e..2e041eff10 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.recovery.RecoveryStatus
@JsonpDeserializable
-public class RecoveryStatus implements JsonpSerializable {
+public class RecoveryStatus implements PlainJsonSerializable {
private final List 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 78ef2987f8..01a1e89056 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.recovery.ShardRecovery
@JsonpDeserializable
-public class ShardRecovery implements JsonpSerializable {
+public class ShardRecovery implements PlainJsonSerializable {
private final long id;
private final RecoveryIndexStatus 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 5254bfab24..31eaa521a0 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.recovery.TranslogStatus
@JsonpDeserializable
-public class TranslogStatus implements JsonpSerializable {
+public class TranslogStatus implements PlainJsonSerializable {
private final String percent;
private final long recovered;
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 9b1377ae64..93f9e584aa 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: indices.recovery.VerifyIndex
@JsonpDeserializable
-public class VerifyIndex implements JsonpSerializable {
+public class VerifyIndex implements PlainJsonSerializable {
@Nullable
private final Time checkIndexTime;
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 c89f84781d..5b21e9f837 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.resolve_index.ResolveIndexAliasItem
@JsonpDeserializable
-public class ResolveIndexAliasItem implements JsonpSerializable {
+public class ResolveIndexAliasItem implements PlainJsonSerializable {
private final String name;
private final List 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 29330d36d2..a23b9f3a71 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.resolve_index.ResolveIndexItem
@JsonpDeserializable
-public class ResolveIndexItem implements JsonpSerializable {
+public class ResolveIndexItem implements PlainJsonSerializable {
private final String name;
private final List aliases;
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 8f87f783d7..c08d56203f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.rollover.RolloverConditions
@JsonpDeserializable
-public class RolloverConditions implements JsonpSerializable {
+public class RolloverConditions implements PlainJsonSerializable {
@Nullable
private final Time maxAge;
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 92bc9f0ea8..7ce9d1dcfa 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.segments.IndexSegment
@JsonpDeserializable
-public class IndexSegment implements JsonpSerializable {
+public class IndexSegment implements PlainJsonSerializable {
private final Map> 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 5035142ed3..0c82e3199c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.segments.Segment
@JsonpDeserializable
-public class Segment implements JsonpSerializable {
+public class Segment implements PlainJsonSerializable {
private final Map attributes;
private final boolean committed;
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 f655ca174f..f6b131df2c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.segments.ShardSegmentRouting
@JsonpDeserializable
-public class ShardSegmentRouting implements JsonpSerializable {
+public class ShardSegmentRouting implements PlainJsonSerializable {
private final String node;
private final boolean primary;
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 5d26d2e8a8..dca418771d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.segments.ShardsSegment
@JsonpDeserializable
-public class ShardsSegment implements JsonpSerializable {
+public class ShardsSegment implements PlainJsonSerializable {
private final int numCommittedSegments;
private final ShardSegmentRouting routing;
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 d2a92f4de0..1f5a0a48b8 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.shard_stores.IndicesShardStores
@JsonpDeserializable
-public class IndicesShardStores implements JsonpSerializable {
+public class IndicesShardStores implements PlainJsonSerializable {
private final Map 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 d98a4cba3c..3f1add7602 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: indices.shard_stores.ShardStore
@JsonpDeserializable
-public class ShardStore implements JsonpSerializable {
+public class ShardStore implements PlainJsonSerializable {
private final ShardStoreAllocation allocation;
private final String allocationId;
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 ce621ca944..0a5fb968db 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.shard_stores.ShardStoreException
@JsonpDeserializable
-public class ShardStoreException implements JsonpSerializable {
+public class ShardStoreException implements PlainJsonSerializable {
private final String reason;
private final String type;
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 e88aacc955..9f42069e79 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.shard_stores.ShardStoreWrapper
@JsonpDeserializable
-public class ShardStoreWrapper implements JsonpSerializable {
+public class ShardStoreWrapper implements PlainJsonSerializable {
private final List 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 a47a9196bd..e3261c3927 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.simulate_template.Overlapping
@JsonpDeserializable
-public class Overlapping implements JsonpSerializable {
+public class Overlapping implements PlainJsonSerializable {
private final String name;
private final List indexPatterns;
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 832f1d8857..73b0a66b65 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.mapping.TypeMapping;
import org.opensearch.client.opensearch.indices.Alias;
import org.opensearch.client.util.ApiTypeHelper;
@@ -52,7 +52,7 @@
// typedef: indices.simulate_template.Template
@JsonpDeserializable
-public class Template implements JsonpSerializable {
+public class Template implements PlainJsonSerializable {
private final Map aliases;
private final TypeMapping mappings;
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 dc123f4b25..79cdbcd993 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.BulkStats;
import org.opensearch.client.opensearch._types.CompletionStats;
import org.opensearch.client.opensearch._types.DocStats;
@@ -64,7 +64,7 @@
// typedef: indices.stats.IndexStats
@JsonpDeserializable
-public class IndexStats implements JsonpSerializable {
+public class IndexStats implements PlainJsonSerializable {
@Nullable
private final CompletionStats completion;
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 ced21fc9ba..ba06a8e121 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: indices.stats.IndicesStats
@JsonpDeserializable
-public class IndicesStats implements JsonpSerializable {
+public class IndicesStats implements PlainJsonSerializable {
private final IndexStats primaries;
private final Map> shards;
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 75b593c04e..a75948cfe6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.stats.ShardCommit
@JsonpDeserializable
-public class ShardCommit implements JsonpSerializable {
+public class ShardCommit implements PlainJsonSerializable {
private final int generation;
private final String id;
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 a24eda914e..5f2c2e253d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.stats.ShardFileSizeInfo
@JsonpDeserializable
-public class ShardFileSizeInfo implements JsonpSerializable {
+public class ShardFileSizeInfo implements PlainJsonSerializable {
private final String description;
private final long sizeInBytes;
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 b946fe60f1..ebdc236750 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.stats.ShardLease
@JsonpDeserializable
-public class ShardLease implements JsonpSerializable {
+public class ShardLease implements PlainJsonSerializable {
private final String id;
private final long retainingSeqNo;
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 4703b36255..a27d3b5faa 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.stats.ShardPath
@JsonpDeserializable
-public class ShardPath implements JsonpSerializable {
+public class ShardPath implements PlainJsonSerializable {
private final String dataPath;
private final boolean isCustomDataPath;
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 8819b2c232..498d2cf8ef 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.stats.ShardQueryCache
@JsonpDeserializable
-public class ShardQueryCache implements JsonpSerializable {
+public class ShardQueryCache implements PlainJsonSerializable {
private final long cacheCount;
private final long cacheSize;
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 893ac2243f..edaa6d145b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.stats.ShardRetentionLeases
@JsonpDeserializable
-public class ShardRetentionLeases implements JsonpSerializable {
+public class ShardRetentionLeases implements PlainJsonSerializable {
private final long primaryTerm;
private final long version;
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 a120000d29..8e483f3348 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.stats.ShardRouting
@JsonpDeserializable
-public class ShardRouting implements JsonpSerializable {
+public class ShardRouting implements PlainJsonSerializable {
private final String node;
private final boolean primary;
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 ac75d5b1e3..178f185c94 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.stats.ShardSequenceNumber
@JsonpDeserializable
-public class ShardSequenceNumber implements JsonpSerializable {
+public class ShardSequenceNumber implements PlainJsonSerializable {
private final long globalCheckpoint;
private final long localCheckpoint;
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 c08d2b2033..9cc34fa4d5 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.BulkStats;
import org.opensearch.client.opensearch._types.CompletionStats;
import org.opensearch.client.opensearch._types.DocStats;
@@ -64,7 +64,7 @@
// typedef: indices.stats.ShardStats
@JsonpDeserializable
-public class ShardStats implements JsonpSerializable {
+public class ShardStats implements PlainJsonSerializable {
private final ShardCommit commit;
private final CompletionStats completion;
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 877a7b8239..60d6cf4f4a 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: indices.stats.ShardsTotalStats
@JsonpDeserializable
-public class ShardsTotalStats implements JsonpSerializable {
+public class ShardsTotalStats implements PlainJsonSerializable {
private final long totalCount;
// ---------------------------------------------------------------------------------------------
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 51f71f7ccf..36b901525b 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: indices.validate_query.IndicesValidationExplanation
@JsonpDeserializable
-public class IndicesValidationExplanation implements JsonpSerializable {
+public class IndicesValidationExplanation implements PlainJsonSerializable {
@Nullable
private final String error;
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 175cc1340b..fddf72f81e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
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;
@@ -50,7 +50,7 @@
// typedef: ingest.geo_ip_stats.Response
@JsonpDeserializable
-public class GeoIpStatsResponse implements JsonpSerializable {
+public class GeoIpStatsResponse implements PlainJsonSerializable {
private final GeoIpDownloadStatistics stats;
private final Map nodes;
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 768d32e939..4d2bb4e319 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: ingest._types.InferenceConfig
@JsonpDeserializable
-public class InferenceConfig implements JsonpSerializable {
+public class InferenceConfig implements PlainJsonSerializable {
@Nullable
private final InferenceConfigRegression 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 fbb9fa9b6a..c3c80989ee 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: ingest._types.InferenceConfigRegression
@JsonpDeserializable
-public class InferenceConfigRegression implements JsonpSerializable {
+public class InferenceConfigRegression implements PlainJsonSerializable {
private final String resultsField;
// ---------------------------------------------------------------------------------------------
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 05607db39b..5509db6e9f 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: ingest._types.Pipeline
@JsonpDeserializable
-public class Pipeline implements JsonpSerializable {
+public class Pipeline implements PlainJsonSerializable {
@Nullable
private final String description;
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 d4e51d1043..2a8ff8dc0d 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
@@ -38,15 +38,15 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: ingest._types.ProcessorBase
-public abstract class ProcessorBase implements JsonpSerializable {
+public abstract class ProcessorBase implements PlainJsonSerializable {
@Nullable
private final String if_;
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 2e48cae697..8b3d72b622 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: ingest.processor_grok.Response
@JsonpDeserializable
-public class ProcessorGrokResponse implements JsonpSerializable {
+public class ProcessorGrokResponse implements PlainJsonSerializable {
private final Map patterns;
// ---------------------------------------------------------------------------------------------
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 163e03dda2..2c500140ac 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class PutPipelineRequest extends RequestBase implements JsonpSerializable {
+public class PutPipelineRequest extends RequestBase implements PlainJsonSerializable {
private final Map meta;
@Nullable
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 c24768ed99..e5316702d0 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch.ingest.simulate.Document;
@@ -60,7 +60,7 @@
*
*/
@JsonpDeserializable
-public class SimulateRequest extends RequestBase implements JsonpSerializable {
+public class SimulateRequest extends RequestBase implements PlainJsonSerializable {
private final List docs;
@Nullable
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 5ca64baa0a..cd729a45f6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.ingest.simulate.PipelineSimulation;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: ingest.simulate.Response
@JsonpDeserializable
-public class SimulateResponse implements JsonpSerializable {
+public class SimulateResponse implements PlainJsonSerializable {
private final List docs;
// ---------------------------------------------------------------------------------------------
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 0aceae8857..ddbc03f616 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: ingest.geo_ip_stats.GeoIpDownloadStatistics
@JsonpDeserializable
-public class GeoIpDownloadStatistics implements JsonpSerializable {
+public class GeoIpDownloadStatistics implements PlainJsonSerializable {
private final int successfulDownloads;
private final int failedDownloads;
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 480df1a071..3ad63fca6f 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: ingest.geo_ip_stats.GeoIpNodeDatabaseName
@JsonpDeserializable
-public class GeoIpNodeDatabaseName implements JsonpSerializable {
+public class GeoIpNodeDatabaseName implements PlainJsonSerializable {
private final String 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 9d4d26a160..fb09d31957 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -52,7 +52,7 @@
*
*/
@JsonpDeserializable
-public class GeoIpNodeDatabases implements JsonpSerializable {
+public class GeoIpNodeDatabases implements PlainJsonSerializable {
private final List databases;
private final List filesInTemp;
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 53be67c2ce..b11aace9ef 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: ingest.simulate.Document
@JsonpDeserializable
-public class Document implements JsonpSerializable {
+public class Document implements PlainJsonSerializable {
@Nullable
private final String id;
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 d6c2c3255e..56a11db7e9 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: ingest.simulate.DocumentSimulation
@JsonpDeserializable
-public class DocumentSimulation implements JsonpSerializable {
+public class DocumentSimulation implements PlainJsonSerializable {
private final String id;
private final String index;
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 37e9304416..e91915f8ce 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: ingest.simulate.Ingest
@JsonpDeserializable
-public class Ingest implements JsonpSerializable {
+public class Ingest implements PlainJsonSerializable {
private final String timestamp;
@Nullable
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 c86b1580e7..e68719c7e3 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ActionStatusOptions;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: ingest.simulate.PipelineSimulation
@JsonpDeserializable
-public class PipelineSimulation implements JsonpSerializable {
+public class PipelineSimulation implements PlainJsonSerializable {
@Nullable
private final DocumentSimulation doc;
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 84bc5279f3..fd746e15d1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.AdaptiveSelection
@JsonpDeserializable
-public class AdaptiveSelection implements JsonpSerializable {
+public class AdaptiveSelection implements PlainJsonSerializable {
private final long avgQueueSize;
private final long avgResponseTimeNs;
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 37543efded..523167223d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.Breaker
@JsonpDeserializable
-public class Breaker implements JsonpSerializable {
+public class Breaker implements PlainJsonSerializable {
private final String estimatedSize;
private final long estimatedSizeInBytes;
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 9b9b43aad0..69c3d54686 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes._types.Cpu
@JsonpDeserializable
-public class Cpu implements JsonpSerializable {
+public class Cpu implements PlainJsonSerializable {
private final int percent;
@Nullable
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 735724194e..f5d1c40270 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.DataPathStats
@JsonpDeserializable
-public class DataPathStats implements JsonpSerializable {
+public class DataPathStats implements PlainJsonSerializable {
private final long availableInBytes;
private final long freeInBytes;
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 d82c17ae82..e821547f9c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes._types.FileSystem
@JsonpDeserializable
-public class FileSystem implements JsonpSerializable {
+public class FileSystem implements PlainJsonSerializable {
private final List data;
private final long timestamp;
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 57d79f9346..2b4f2c4407 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.FileSystemTotal
@JsonpDeserializable
-public class FileSystemTotal implements JsonpSerializable {
+public class FileSystemTotal implements PlainJsonSerializable {
private final long availableInBytes;
private final long freeInBytes;
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 b0d91fb8e3..5bd7e3260f 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes._types.GarbageCollector
@JsonpDeserializable
-public class GarbageCollector implements JsonpSerializable {
+public class GarbageCollector implements PlainJsonSerializable {
private final Map 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 e8876cb86c..72ec131b4b 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.GarbageCollectorTotal
@JsonpDeserializable
-public class GarbageCollectorTotal implements JsonpSerializable {
+public class GarbageCollectorTotal implements PlainJsonSerializable {
private final long collectionCount;
private final long collectionTimeInMillis;
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 6b888c8808..2438d58ac6 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.nodes.hot_threads.HotThread;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: nodes.hot_threads.Response
@JsonpDeserializable
-public class HotThreadsResponse implements JsonpSerializable {
+public class HotThreadsResponse implements PlainJsonSerializable {
private final List hotThreads;
// ---------------------------------------------------------------------------------------------
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 de19c4249b..8caa1e3d61 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.Http
@JsonpDeserializable
-public class Http implements JsonpSerializable {
+public class Http implements PlainJsonSerializable {
private final int currentOpen;
private final long totalOpened;
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 d5b18efe07..1bef029860 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes._types.Ingest
@JsonpDeserializable
-public class Ingest implements JsonpSerializable {
+public class Ingest implements PlainJsonSerializable {
private final Map pipelines;
private final IngestTotal 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 b82f828722..fb48567e3a 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.IngestTotal
@JsonpDeserializable
-public class IngestTotal implements JsonpSerializable {
+public class IngestTotal implements PlainJsonSerializable {
private final long count;
private final long current;
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 ec1d18b2cb..f2f4c00443 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes._types.Jvm
@JsonpDeserializable
-public class Jvm implements JsonpSerializable {
+public class Jvm implements PlainJsonSerializable {
private final Map bufferPools;
private final JvmClasses classes;
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 df7f53639a..84c6f645f3 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.JvmClasses
@JsonpDeserializable
-public class JvmClasses implements JsonpSerializable {
+public class JvmClasses implements PlainJsonSerializable {
private final long currentLoadedCount;
private final long totalLoadedCount;
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 3ee898cae3..57dd1eafaf 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.JvmThreads
@JsonpDeserializable
-public class JvmThreads implements JsonpSerializable {
+public class JvmThreads implements PlainJsonSerializable {
private final long count;
private final long peakCount;
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 a197ea5c84..68ef6bd907 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.KeyedProcessor
@JsonpDeserializable
-public class KeyedProcessor implements JsonpSerializable {
+public class KeyedProcessor implements PlainJsonSerializable {
private final Process statistics;
private final String 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 1a9ea002d6..7313143b86 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: nodes._types.MemoryStats
@JsonpDeserializable
-public class MemoryStats implements JsonpSerializable {
+public class MemoryStats implements PlainJsonSerializable {
@Nullable
private final String resident;
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 37f254674c..192f020e1d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.NodeBufferPool
@JsonpDeserializable
-public class NodeBufferPool implements JsonpSerializable {
+public class NodeBufferPool implements PlainJsonSerializable {
private final long count;
private final long totalCapacityInBytes;
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 9ce20d76dd..b162f314c9 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
@@ -35,8 +35,8 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.NodeStatistics;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -44,7 +44,7 @@
// typedef: nodes._types.NodesResponseBase
-public abstract class NodesResponseBase implements JsonpSerializable {
+public abstract class NodesResponseBase implements PlainJsonSerializable {
private final NodeStatistics nodeStats;
// ---------------------------------------------------------------------------------------------
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 c8e60e5c24..6d602e2a15 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.OperatingSystem
@JsonpDeserializable
-public class OperatingSystem implements JsonpSerializable {
+public class OperatingSystem implements PlainJsonSerializable {
private final Cpu cpu;
private final ExtendedMemoryStats mem;
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 b581a1ad98..3deafb0827 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.Process
@JsonpDeserializable
-public class Process implements JsonpSerializable {
+public class Process implements PlainJsonSerializable {
private final Cpu cpu;
private final MemoryStats mem;
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 be72231e39..e5ef71ed8e 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -60,7 +60,7 @@
* Reloads secure settings.
*/
@JsonpDeserializable
-public class ReloadSecureSettingsRequest extends RequestBase implements JsonpSerializable {
+public class ReloadSecureSettingsRequest extends RequestBase implements PlainJsonSerializable {
private final List nodeId;
@Nullable
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 9fb8d57ece..50e0bc2a8a 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.Scripting
@JsonpDeserializable
-public class Scripting implements JsonpSerializable {
+public class Scripting implements PlainJsonSerializable {
private final long cacheEvictions;
private final long 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 dc9d840e38..1c2c8c7f35 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.NodeRole;
import org.opensearch.client.opensearch.indices.stats.IndexStats;
import org.opensearch.client.util.ApiTypeHelper;
@@ -52,7 +52,7 @@
// typedef: nodes._types.Stats
@JsonpDeserializable
-public class Stats implements JsonpSerializable {
+public class Stats implements PlainJsonSerializable {
@Nullable
private final Map adaptiveSelection;
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 c96f7a9d1f..510a69183b 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.ThreadCount
@JsonpDeserializable
-public class ThreadCount implements JsonpSerializable {
+public class ThreadCount implements PlainJsonSerializable {
private final long active;
private final long completed;
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 f7c728cd0e..2e7575efe4 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes._types.Transport
@JsonpDeserializable
-public class Transport implements JsonpSerializable {
+public class Transport implements PlainJsonSerializable {
private final long rxCount;
private final long rxSizeInBytes;
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 920f75b062..39308df759 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.hot_threads.HotThread
@JsonpDeserializable
-public class HotThread implements JsonpSerializable {
+public class HotThread implements PlainJsonSerializable {
private final List hosts;
private final String nodeId;
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 c208387e92..94df6b761c 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.NodeRole;
import org.opensearch.client.opensearch._types.PluginStats;
import org.opensearch.client.util.ApiTypeHelper;
@@ -52,7 +52,7 @@
// typedef: nodes.info.NodeInfo
@JsonpDeserializable
-public class NodeInfo implements JsonpSerializable {
+public class NodeInfo implements PlainJsonSerializable {
@Nullable
private final Map attributes;
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 42301372eb..68cfec5466 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoAction
@JsonpDeserializable
-public class NodeInfoAction implements JsonpSerializable {
+public class NodeInfoAction implements PlainJsonSerializable {
private final String destructiveRequiresName;
// ---------------------------------------------------------------------------------------------
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 542c0e2983..9c006dfd3c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoAggregation
@JsonpDeserializable
-public class NodeInfoAggregation implements JsonpSerializable {
+public class NodeInfoAggregation implements PlainJsonSerializable {
private final List 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 002163cf7c..cea031451e 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoBootstrap
@JsonpDeserializable
-public class NodeInfoBootstrap implements JsonpSerializable {
+public class NodeInfoBootstrap implements PlainJsonSerializable {
private final String memoryLock;
// ---------------------------------------------------------------------------------------------
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 8217625004..a6ef56f741 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoClient
@JsonpDeserializable
-public class NodeInfoClient implements JsonpSerializable {
+public class NodeInfoClient implements PlainJsonSerializable {
private final String 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 52430e25d7..8bc0deffed 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
@@ -40,16 +40,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: nodes.info.NodeInfoDiscover
@JsonpDeserializable
-public class NodeInfoDiscover implements JsonpSerializable {
+public class NodeInfoDiscover implements PlainJsonSerializable {
@Nullable
private final List seedHosts;
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 17ecc5bf6a..7d1f803fec 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes.info.NodeInfoHttp
@JsonpDeserializable
-public class NodeInfoHttp implements JsonpSerializable {
+public class NodeInfoHttp implements PlainJsonSerializable {
private final List boundAddress;
@Nullable
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 7f028caf6d..372026cc20 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoIngest
@JsonpDeserializable
-public class NodeInfoIngest implements JsonpSerializable {
+public class NodeInfoIngest implements PlainJsonSerializable {
private final List 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 a7c6a3176e..5a4b98195c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoIngestDownloader
@JsonpDeserializable
-public class NodeInfoIngestDownloader implements JsonpSerializable {
+public class NodeInfoIngestDownloader implements PlainJsonSerializable {
private final String 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 11f87c4591..470a85c481 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoIngestInfo
@JsonpDeserializable
-public class NodeInfoIngestInfo implements JsonpSerializable {
+public class NodeInfoIngestInfo implements PlainJsonSerializable {
private final NodeInfoIngestDownloader 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 8ed86f9508..3ee450a736 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoIngestProcessor
@JsonpDeserializable
-public class NodeInfoIngestProcessor implements JsonpSerializable {
+public class NodeInfoIngestProcessor implements PlainJsonSerializable {
private final String 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 308e267c6a..960ab58d99 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoJvmMemory
@JsonpDeserializable
-public class NodeInfoJvmMemory implements JsonpSerializable {
+public class NodeInfoJvmMemory implements PlainJsonSerializable {
@Nullable
private final String directMax;
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 817c175e82..bf72e91851 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoMemory
@JsonpDeserializable
-public class NodeInfoMemory implements JsonpSerializable {
+public class NodeInfoMemory implements PlainJsonSerializable {
private final String total;
private final long totalInBytes;
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 93ecdb75ca..56d2dfc434 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoNetwork
@JsonpDeserializable
-public class NodeInfoNetwork implements JsonpSerializable {
+public class NodeInfoNetwork implements PlainJsonSerializable {
private final NodeInfoNetworkInterface primaryInterface;
private final int refreshInterval;
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 19bc708d6b..981ea8adb1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoNetworkInterface
@JsonpDeserializable
-public class NodeInfoNetworkInterface implements JsonpSerializable {
+public class NodeInfoNetworkInterface implements PlainJsonSerializable {
private final String address;
private final String macAddress;
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 12100ce24f..a0bc9b7639 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoOSCPU
@JsonpDeserializable
-public class NodeInfoOSCPU implements JsonpSerializable {
+public class NodeInfoOSCPU implements PlainJsonSerializable {
private final String cacheSize;
private final int cacheSizeInBytes;
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 fe1ba9ea67..08dd088363 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes.info.NodeInfoPath
@JsonpDeserializable
-public class NodeInfoPath implements JsonpSerializable {
+public class NodeInfoPath implements PlainJsonSerializable {
private final String logs;
private final String home;
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 bacdb053af..cd94cb330c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoRepositories
@JsonpDeserializable
-public class NodeInfoRepositories implements JsonpSerializable {
+public class NodeInfoRepositories implements PlainJsonSerializable {
private final NodeInfoRepositoriesUrl 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 48de4505c1..02e2767485 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoRepositoriesUrl
@JsonpDeserializable
-public class NodeInfoRepositoriesUrl implements JsonpSerializable {
+public class NodeInfoRepositoriesUrl implements PlainJsonSerializable {
private final String allowedUrls;
// ---------------------------------------------------------------------------------------------
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 55e05e34c3..7e7d57f31d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoScript
@JsonpDeserializable
-public class NodeInfoScript implements JsonpSerializable {
+public class NodeInfoScript implements PlainJsonSerializable {
@Nullable
private final String allowedTypes;
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 53351d2859..5c32070e9d 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSearch
@JsonpDeserializable
-public class NodeInfoSearch implements JsonpSerializable {
+public class NodeInfoSearch implements PlainJsonSerializable {
private final NodeInfoSearchRemote 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 40d837c68c..35f9c7d079 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSearchRemote
@JsonpDeserializable
-public class NodeInfoSearchRemote implements JsonpSerializable {
+public class NodeInfoSearchRemote implements PlainJsonSerializable {
private final String 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 421637ecdb..74f60b2a2c 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoSettings
@JsonpDeserializable
-public class NodeInfoSettings implements JsonpSerializable {
+public class NodeInfoSettings implements PlainJsonSerializable {
private final NodeInfoSettingsCluster cluster;
private final NodeInfoSettingsNode node;
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 24245aae62..2ef98298c7 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.indices.IndexRouting;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: nodes.info.NodeInfoSettingsCluster
@JsonpDeserializable
-public class NodeInfoSettingsCluster implements JsonpSerializable {
+public class NodeInfoSettingsCluster implements PlainJsonSerializable {
private final String name;
@Nullable
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 7901e47775..a499a6fbc0 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSettingsClusterElection
@JsonpDeserializable
-public class NodeInfoSettingsClusterElection implements JsonpSerializable {
+public class NodeInfoSettingsClusterElection implements PlainJsonSerializable {
private final String 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 df27325cba..3e63092705 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoSettingsHttp
@JsonpDeserializable
-public class NodeInfoSettingsHttp implements JsonpSerializable {
+public class NodeInfoSettingsHttp implements PlainJsonSerializable {
private final NodeInfoSettingsHttpType type;
@Nullable
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 10df5c4719..d5415f553c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSettingsHttpType
@JsonpDeserializable
-public class NodeInfoSettingsHttpType implements JsonpSerializable {
+public class NodeInfoSettingsHttpType implements PlainJsonSerializable {
private final String 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 f0993da030..28f1607127 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
@@ -38,16 +38,16 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
// typedef: nodes.info.NodeInfoSettingsIngest
@JsonpDeserializable
-public class NodeInfoSettingsIngest implements JsonpSerializable {
+public class NodeInfoSettingsIngest implements PlainJsonSerializable {
@Nullable
private final NodeInfoIngestInfo attachment;
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 7466fb5724..ec0125d1a1 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSettingsNetwork
@JsonpDeserializable
-public class NodeInfoSettingsNetwork implements JsonpSerializable {
+public class NodeInfoSettingsNetwork implements PlainJsonSerializable {
private final String 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 533843776b..caddcc7a6e 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: nodes.info.NodeInfoSettingsNode
@JsonpDeserializable
-public class NodeInfoSettingsNode implements JsonpSerializable {
+public class NodeInfoSettingsNode implements PlainJsonSerializable {
private final String name;
@Nullable
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 f105482d23..764cb2d222 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeInfoSettingsTransport
@JsonpDeserializable
-public class NodeInfoSettingsTransport implements JsonpSerializable {
+public class NodeInfoSettingsTransport implements PlainJsonSerializable {
private final NodeInfoSettingsTransportType type;
@Nullable
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 1a3a34c322..5fcfe16271 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeInfoSettingsTransportType
@JsonpDeserializable
-public class NodeInfoSettingsTransportType implements JsonpSerializable {
+public class NodeInfoSettingsTransportType implements PlainJsonSerializable {
private final String 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 1aa10a9662..84611e0a09 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes.info.NodeInfoTransport
@JsonpDeserializable
-public class NodeInfoTransport implements JsonpSerializable {
+public class NodeInfoTransport implements PlainJsonSerializable {
private final List boundAddress;
private final String publishAddress;
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 5d156d71fc..6ff32b8ec8 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes.info.NodeJvmInfo
@JsonpDeserializable
-public class NodeJvmInfo implements JsonpSerializable {
+public class NodeJvmInfo implements PlainJsonSerializable {
private final List gcCollectors;
private final NodeInfoJvmMemory mem;
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 64580d0958..18aad51e4d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeOperatingSystemInfo
@JsonpDeserializable
-public class NodeOperatingSystemInfo implements JsonpSerializable {
+public class NodeOperatingSystemInfo implements PlainJsonSerializable {
private final String arch;
private final int availableProcessors;
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 4cb6e5eb2f..0dcc3e59bf 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: nodes.info.NodeProcessInfo
@JsonpDeserializable
-public class NodeProcessInfo implements JsonpSerializable {
+public class NodeProcessInfo implements PlainJsonSerializable {
private final long id;
private final boolean mlockall;
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 d037587798..bae4c58c11 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: nodes.info.NodeThreadPoolInfo
@JsonpDeserializable
-public class NodeThreadPoolInfo implements JsonpSerializable {
+public class NodeThreadPoolInfo implements PlainJsonSerializable {
@Nullable
private final Integer core;
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 c3d05a3028..dbb52aceca 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: nodes.reload_secure_settings.NodeReloadError
@JsonpDeserializable
-public class NodeReloadError implements JsonpSerializable {
+public class NodeReloadError implements PlainJsonSerializable {
private final String name;
@Nullable
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 09095b3d3b..521b94054d 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -49,7 +49,7 @@
// typedef: nodes.usage.NodeUsage
@JsonpDeserializable
-public class NodeUsage implements JsonpSerializable {
+public class NodeUsage implements PlainJsonSerializable {
private final Map restActions;
private final String since;
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 03b81125f5..bbfb00a450 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.shutdown.get_node.NodeShutdownStatus;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: shutdown.get_node.Response
@JsonpDeserializable
-public class GetNodeResponse implements JsonpSerializable {
+public class GetNodeResponse implements PlainJsonSerializable {
private final List nodes;
// ---------------------------------------------------------------------------------------------
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 667affd878..a44b2383fb 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
*
*/
@JsonpDeserializable
-public class NodeShutdownStatus implements JsonpSerializable {
+public class NodeShutdownStatus implements PlainJsonSerializable {
private final String nodeId;
private final ShutdownType type;
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 929b8c5963..d406b4e110 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: shutdown.get_node.PersistentTaskStatus
@JsonpDeserializable
-public class PersistentTaskStatus implements JsonpSerializable {
+public class PersistentTaskStatus implements PlainJsonSerializable {
private final ShutdownStatus 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 a9528b6ed6..447c32993c 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: shutdown.get_node.PluginsStatus
@JsonpDeserializable
-public class PluginsStatus implements JsonpSerializable {
+public class PluginsStatus implements PlainJsonSerializable {
private final ShutdownStatus 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 cf9f37bd4a..752b6749ec 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: shutdown.get_node.ShardMigrationStatus
@JsonpDeserializable
-public class ShardMigrationStatus implements JsonpSerializable {
+public class ShardMigrationStatus implements PlainJsonSerializable {
private final ShutdownStatus status;
// ---------------------------------------------------------------------------------------------
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 88bd225e5f..40ed5d13b7 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.snapshot.cleanup_repository.CleanupRepositoryResults;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: snapshot.cleanup_repository.Response
@JsonpDeserializable
-public class CleanupRepositoryResponse implements JsonpSerializable {
+public class CleanupRepositoryResponse implements PlainJsonSerializable {
private final CleanupRepositoryResults 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 565c45d508..b6e03de864 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -59,7 +59,7 @@
* repository.
*/
@JsonpDeserializable
-public class CloneSnapshotRequest extends RequestBase implements JsonpSerializable {
+public class CloneSnapshotRequest extends RequestBase implements PlainJsonSerializable {
private final String indices;
@Deprecated
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 5019dcd0e1..dfe04f47e8 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -59,7 +59,7 @@
*
*/
@JsonpDeserializable
-public class CreateRepositoryRequest extends RequestBase implements JsonpSerializable {
+public class CreateRepositoryRequest extends RequestBase implements PlainJsonSerializable {
@Deprecated
@Nullable
private final Time masterTimeout;
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 d9433cdf8f..4a1e14baea 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
@@ -42,9 +42,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -61,7 +61,7 @@
*
*/
@JsonpDeserializable
-public class CreateSnapshotRequest extends RequestBase implements JsonpSerializable {
+public class CreateSnapshotRequest extends RequestBase implements PlainJsonSerializable {
private final List featureStates;
@Nullable
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 0ebb53a094..301bda1d05 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot.create.Response
@JsonpDeserializable
-public class CreateSnapshotResponse implements JsonpSerializable {
+public class CreateSnapshotResponse implements PlainJsonSerializable {
@Nullable
private final Boolean accepted;
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 b097fdfa39..710ad248a8 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.FileCountSnapshotStats
@JsonpDeserializable
-public class FileCountSnapshotStats implements JsonpSerializable {
+public class FileCountSnapshotStats implements PlainJsonSerializable {
private final int fileCount;
private final long sizeInBytes;
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 d3c51899a9..7fb3c8a635 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.snapshot.get.SnapshotResponseItem;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -50,7 +50,7 @@
// typedef: snapshot.get.Response
@JsonpDeserializable
-public class GetSnapshotResponse implements JsonpSerializable {
+public class GetSnapshotResponse implements PlainJsonSerializable {
private final List responses;
private final List snapshots;
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 bcf7f608f4..be058253b5 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.IndexDetails
@JsonpDeserializable
-public class IndexDetails implements JsonpSerializable {
+public class IndexDetails implements PlainJsonSerializable {
private final int shardCount;
@Nullable
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 4e48263d57..1f46badd72 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.InfoFeatureState
@JsonpDeserializable
-public class InfoFeatureState implements JsonpSerializable {
+public class InfoFeatureState implements PlainJsonSerializable {
private final String featureName;
private final List indices;
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 d199f71e25..a74628a5fb 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.Repository
@JsonpDeserializable
-public class Repository implements JsonpSerializable {
+public class Repository implements PlainJsonSerializable {
private final String type;
@Nullable
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 0298450ac9..601a2de702 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.RepositorySettings
@JsonpDeserializable
-public class RepositorySettings implements JsonpSerializable {
+public class RepositorySettings implements PlainJsonSerializable {
@Nullable
private final String chunkSize;
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 0d315c0ae2..1e6754e8aa 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorResponse;
import org.opensearch.client.opensearch._types.RequestBase;
import org.opensearch.client.opensearch._types.Time;
@@ -60,7 +60,7 @@
* Restores a snapshot.
*/
@JsonpDeserializable
-public class RestoreRequest extends RequestBase implements JsonpSerializable {
+public class RestoreRequest extends RequestBase implements PlainJsonSerializable {
private final List ignoreIndexSettings;
@Nullable
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 b8c6e5e51e..2791c31793 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.snapshot.restore.SnapshotRestore;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -48,7 +48,7 @@
// typedef: snapshot.restore.Response
@JsonpDeserializable
-public class RestoreResponse implements JsonpSerializable {
+public class RestoreResponse implements PlainJsonSerializable {
private final SnapshotRestore 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 d898f1665b..1082b64f68 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.ShardsStats
@JsonpDeserializable
-public class ShardsStats implements JsonpSerializable {
+public class ShardsStats implements PlainJsonSerializable {
private final long done;
private final long failed;
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 827435ffdb..1ed6c2deb7 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.ShardsStatsSummary
@JsonpDeserializable
-public class ShardsStatsSummary implements JsonpSerializable {
+public class ShardsStatsSummary implements PlainJsonSerializable {
private final ShardsStatsSummaryItem incremental;
private final ShardsStatsSummaryItem total;
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 a54739a113..6c4ef63a6e 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.ShardsStatsSummaryItem
@JsonpDeserializable
-public class ShardsStatsSummaryItem implements JsonpSerializable {
+public class ShardsStatsSummaryItem implements PlainJsonSerializable {
private final long fileCount;
private final long sizeInBytes;
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 ccd9093c87..52ca17a410 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.SnapshotIndexStats
@JsonpDeserializable
-public class SnapshotIndexStats implements JsonpSerializable {
+public class SnapshotIndexStats implements PlainJsonSerializable {
private final Map shards;
private final ShardsStats shardsStats;
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 fcb0ed53a6..fe4f7ff412 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
@@ -41,9 +41,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
@@ -53,7 +53,7 @@
// typedef: snapshot._types.SnapshotInfo
@JsonpDeserializable
-public class SnapshotInfo implements JsonpSerializable {
+public class SnapshotInfo implements PlainJsonSerializable {
private final List dataStreams;
@Nullable
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 9d48723f17..e13b35e127 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.SnapshotShardFailure
@JsonpDeserializable
-public class SnapshotShardFailure implements JsonpSerializable {
+public class SnapshotShardFailure implements PlainJsonSerializable {
private final String index;
private final String nodeId;
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 23e93651ba..21ffa324b4 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.SnapshotShardsStatus
@JsonpDeserializable
-public class SnapshotShardsStatus implements JsonpSerializable {
+public class SnapshotShardsStatus implements PlainJsonSerializable {
private final ShardsStatsStage stage;
private final ShardsStatsSummary 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 b910465379..bb2b44eb3f 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot._types.SnapshotStats
@JsonpDeserializable
-public class SnapshotStats implements JsonpSerializable {
+public class SnapshotStats implements PlainJsonSerializable {
private final FileCountSnapshotStats incremental;
private final long startTimeInMillis;
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 01790f8b4b..e97f02540d 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot.status.Response
@JsonpDeserializable
-public class SnapshotStatusResponse implements JsonpSerializable {
+public class SnapshotStatusResponse implements PlainJsonSerializable {
private final List 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 b9845a59c8..03992f5175 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: snapshot._types.Status
@JsonpDeserializable
-public class Status implements JsonpSerializable {
+public class Status implements PlainJsonSerializable {
private final boolean includeGlobalState;
private final Map indices;
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 09350291e8..4efe8e604e 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch.snapshot.verify_repository.CompactNodeInfo;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: snapshot.verify_repository.Response
@JsonpDeserializable
-public class VerifyRepositoryResponse implements JsonpSerializable {
+public class VerifyRepositoryResponse implements PlainJsonSerializable {
private final Map 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 45e8a791f4..8b674ec955 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot.cleanup_repository.CleanupRepositoryResults
@JsonpDeserializable
-public class CleanupRepositoryResults implements JsonpSerializable {
+public class CleanupRepositoryResults implements PlainJsonSerializable {
private final long deletedBlobs;
private final long deletedBytes;
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 dea724109c..c8e91b9cf6 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.opensearch.snapshot.SnapshotInfo;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: snapshot.get.SnapshotResponseItem
@JsonpDeserializable
-public class SnapshotResponseItem implements JsonpSerializable {
+public class SnapshotResponseItem implements PlainJsonSerializable {
private final String repository;
private final List snapshots;
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 2b02a0cfe8..26a6982644 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ShardStatistics;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: snapshot.restore.SnapshotRestore
@JsonpDeserializable
-public class SnapshotRestore implements JsonpSerializable {
+public class SnapshotRestore implements PlainJsonSerializable {
private final List indices;
private final String snapshot;
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 353da4f6b3..1ee49f758e 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
@@ -37,9 +37,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -47,7 +47,7 @@
// typedef: snapshot.verify_repository.CompactNodeInfo
@JsonpDeserializable
-public class CompactNodeInfo implements JsonpSerializable {
+public class CompactNodeInfo implements PlainJsonSerializable {
private final String name;
// ---------------------------------------------------------------------------------------------
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 937803e200..abe4da1157 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -51,7 +51,7 @@
// typedef: tasks.cancel.Response
@JsonpDeserializable
-public class CancelResponse implements JsonpSerializable {
+public class CancelResponse implements PlainJsonSerializable {
private final List nodeFailures;
private final Map nodes;
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 1e4357eabb..00b4878d81 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -49,7 +49,7 @@
// typedef: tasks.get.Response
@JsonpDeserializable
-public class GetTasksResponse implements JsonpSerializable {
+public class GetTasksResponse implements PlainJsonSerializable {
private final boolean completed;
private final Info task;
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 ceb3e6f887..d2f72fff0d 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: tasks._types.Info
@JsonpDeserializable
-public class Info implements JsonpSerializable {
+public class Info implements PlainJsonSerializable {
private final String action;
private final boolean cancellable;
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 cad62425c7..8f63dbea1f 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.ErrorCause;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
@@ -51,7 +51,7 @@
// typedef: tasks.list.Response
@JsonpDeserializable
-public class ListResponse implements JsonpSerializable {
+public class ListResponse implements PlainJsonSerializable {
private final List nodeFailures;
private final Map nodes;
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 9bcd9e4121..38a227a0c5 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
@@ -40,9 +40,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -50,7 +50,7 @@
// typedef: tasks._types.State
@JsonpDeserializable
-public class State implements JsonpSerializable {
+public class State implements PlainJsonSerializable {
private final String action;
private final boolean cancellable;
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 59e5ad85ad..264dbf04d7 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
@@ -39,9 +39,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.opensearch._types.Retries;
import org.opensearch.client.opensearch._types.Time;
import org.opensearch.client.util.ApiTypeHelper;
@@ -51,7 +51,7 @@
// typedef: tasks._types.Status
@JsonpDeserializable
-public class Status implements JsonpSerializable {
+public class Status implements PlainJsonSerializable {
private final long batches;
@Nullable
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 7df892369a..51187456e7 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
@@ -38,9 +38,9 @@
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.json.PlainJsonSerializable;
import org.opensearch.client.util.ApiTypeHelper;
import org.opensearch.client.util.ObjectBuilder;
import org.opensearch.client.util.ObjectBuilderBase;
@@ -48,7 +48,7 @@
// typedef: watcher._types.HourAndMinute
@JsonpDeserializable
-public class HourAndMinute implements JsonpSerializable {
+public class HourAndMinute implements PlainJsonSerializable {
private final List hour;
private final List minute;
diff --git a/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java b/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java
index d92c22700c..2238ef2854 100644
--- a/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java
+++ b/java-client/src/main/java/org/opensearch/client/transport/endpoints/DictionaryResponse.java
@@ -39,16 +39,16 @@
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.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainJsonSerializable;
import org.opensearch.client.util.ObjectBuilderBase;
/**
* Base class for dictionary responses, i.e. a series of key/value pairs.
*/
-public abstract class DictionaryResponse implements JsonpSerializable {
+public abstract class DictionaryResponse implements PlainJsonSerializable {
private final Map result;
@Nullable
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/json/JsonpSerializableTest.java b/java-client/src/test/java/org/opensearch/client/opensearch/json/PlainJsonSerializableTest.java
similarity index 94%
rename from java-client/src/test/java/org/opensearch/client/opensearch/json/JsonpSerializableTest.java
rename to java-client/src/test/java/org/opensearch/client/opensearch/json/PlainJsonSerializableTest.java
index ed04b85e11..2f504c48fc 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/json/JsonpSerializableTest.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/json/PlainJsonSerializableTest.java
@@ -16,9 +16,9 @@
import org.opensearch.client.opensearch.core.IndexResponse;
import org.opensearch.client.opensearch.core.SearchRequest;
-public class JsonpSerializableTest extends Assert {
+public class PlainJsonSerializableTest extends Assert {
- // Test IndexResponse which extends WriteResponseBase which implements JsonpSerializable
+ // Test IndexResponse which extends WriteResponseBase which implements PlainJsonSerializable
@Test
public void testIndexResponse() {
@@ -50,7 +50,7 @@ public void testIndexResponse() {
assertEquals(expectedStringValue, indexResponseString);
}
- // Test SearchRequest which implements JsonpSerializable
+ // Test SearchRequest which implements PlainJsonSerializable
@Test
public void testSearchResponse() {