Implementing PlainDeserializable on Request classes

Signed-off-by: Jai2305 <[email protected]>
opensearch-project · Aug 25, 2024 · 9f3ba2f · 9f3ba2f
1 parent 9793d12
commit 9f3ba2f
Show file tree

Hide file tree

Showing 76 changed files with 416 additions and 77 deletions.
diff --git a/java-client/src/main/java/org/opensearch/client/json/PlainDeserializable.java b/java-client/src/main/java/org/opensearch/client/json/PlainDeserializable.java
@@ -16,7 +16,7 @@
 
 public interface PlainDeserializable<B> {
 
-    B get();
+    B self();
 
     /** Updates object with newly provided JSON properties
      @param parser the JsonParser parser
@@ -29,7 +29,7 @@ default B withJson(JsonParser parser, JsonpMapper mapper) {
         @SuppressWarnings("unchecked")
         ObjectDeserializer<B> objectDeserializer = (ObjectDeserializer<B>) DelegatingDeserializer.unwrap(deserializer);
         assert objectDeserializer != null;
-        return objectDeserializer.deserialize(get(), parser, mapper, parser.next());
+        return objectDeserializer.deserialize(self(), parser, mapper, parser.next());
     }
 
     /** Updates object with newly provided JSON properties

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
@@ -39,6 +39,7 @@
 import org.opensearch.client.json.JsonpMapper;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+import org.opensearch.client.json.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.json.UnionDeserializer;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -118,7 +119,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link ErrorResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ErrorResponse>, PlainDeserializable<Builder> {
         private ErrorCause error;
 
         private Integer status;
@@ -157,6 +158,11 @@ public ErrorResponse build() {
 
             return new ErrorResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.aliases.AliasesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link AliasesResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AliasesResponse>, PlainDeserializable<Builder> {
         private List<AliasesRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public AliasesResponse build() {
 
             return new AliasesResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<AliasesResponse> _DESERIALIZER = createAliasesResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.allocation.AllocationRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link AllocationResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<AllocationResponse>, PlainDeserializable<Builder> {
         private List<AllocationRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public AllocationResponse build() {
 
             return new AllocationResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<AllocationResponse> _DESERIALIZER = createAllocationResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.cluster_manager.ClusterManagerRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link ClusterManagerResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<ClusterManagerResponse>, PlainDeserializable<Builder> {
         private List<ClusterManagerRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public ClusterManagerResponse build() {
 
             return new ClusterManagerResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<ClusterManagerResponse> _DESERIALIZER = createClusterManagerResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.count.CountRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link CountResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CountResponse>, PlainDeserializable<Builder> {
         private List<CountRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public CountResponse build() {
 
             return new CountResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<CountResponse> _DESERIALIZER = createCountResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.fielddata.FielddataRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link FielddataResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FielddataResponse>, PlainDeserializable<Builder> {
         private List<FielddataRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public FielddataResponse build() {
 
             return new FielddataResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<FielddataResponse> _DESERIALIZER = createFielddataResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.health.HealthRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link HealthResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HealthResponse>, PlainDeserializable<Builder> {
         private List<HealthRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public HealthResponse build() {
 
             return new HealthResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<HealthResponse> _DESERIALIZER = createHealthResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.help.HelpRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link HelpResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HelpResponse>, PlainDeserializable<Builder> {
         private List<HelpRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public HelpResponse build() {
 
             return new HelpResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<HelpResponse> _DESERIALIZER = createHelpResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.indices.IndicesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link IndicesResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndicesResponse>, PlainDeserializable<Builder> {
         private List<IndicesRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public IndicesResponse build() {
 
             return new IndicesResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<IndicesResponse> _DESERIALIZER = createIndicesResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.nodeattrs.NodeAttributesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link NodeattrsResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeattrsResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeattrsResponse>, PlainDeserializable<Builder> {
         private List<NodeAttributesRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public NodeattrsResponse build() {
 
             return new NodeattrsResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<NodeattrsResponse> _DESERIALIZER = createNodeattrsResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.nodes.NodesRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link NodesResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodesResponse>, PlainDeserializable<Builder> {
         private List<NodesRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public NodesResponse build() {
 
             return new NodesResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<NodesResponse> _DESERIALIZER = createNodesResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.pending_tasks.PendingTasksRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link PendingTasksResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PendingTasksResponse>, PlainDeserializable<Builder> {
         private List<PendingTasksRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public PendingTasksResponse build() {
 
             return new PendingTasksResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<PendingTasksResponse> _DESERIALIZER = createPendingTasksResponseDeserializer();

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
@@ -38,6 +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.PlainDeserializable;
 import org.opensearch.client.json.PlainJsonSerializable;
 import org.opensearch.client.opensearch.cat.plugins.PluginsRecord;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -90,7 +91,7 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link PluginsResponse}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsResponse> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<PluginsResponse>, PlainDeserializable<Builder> {
         private List<PluginsRecord> valueBody;
 
         /**
@@ -139,6 +140,11 @@ public PluginsResponse build() {
 
             return new PluginsResponse(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     public static final JsonpDeserializer<PluginsResponse> _DESERIALIZER = createPluginsResponseDeserializer();