Implementing PlainDeserializable for free-formed parameters

Signed-off-by: Jai2305 <[email protected]>
opensearch-project · Sep 1, 2024 · 8bb2517 · 8bb2517
1 parent c101485
commit 8bb2517
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 27 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/mapping/SourceField.java b/java-client/src/main/java/org/opensearch/client/opensearch/_types/mapping/SourceField.java
@@ -41,6 +41,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.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
@@ -172,7 +173,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link SourceField}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceField> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceField>, PlainDeserializable<Builder> {
         @Nullable
         private Boolean compress;
 
@@ -263,6 +264,11 @@ public SourceField build() {
 
             return new SourceField(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

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
@@ -43,6 +43,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.util.ApiTypeHelper;
 import org.opensearch.client.util.ObjectBuilder;
@@ -363,7 +364,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link TypeMapping}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeMapping> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TypeMapping>, PlainDeserializable<Builder> {
         @Nullable
         private AllField allField;
 
@@ -660,6 +661,11 @@ public TypeMapping build() {
 
             return new TypeMapping(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

diff --git a/...ient/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java b/...ient/src/main/java/org/opensearch/client/opensearch/cluster/AllocationExplainRequest.java
@@ -282,7 +282,7 @@ public AllocationExplainRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

diff --git a/...ent/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java b/...ent/src/main/java/org/opensearch/client/opensearch/cluster/PutClusterSettingsRequest.java
@@ -329,7 +329,7 @@ public PutClusterSettingsRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

diff --git a/...t/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java b/...t/src/main/java/org/opensearch/client/opensearch/cluster/PutComponentTemplateRequest.java
@@ -462,7 +462,7 @@ public PutComponentTemplateRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -411,7 +411,7 @@ public RerouteRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -146,7 +146,7 @@ public ClearScrollRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -1296,7 +1296,7 @@ public DeleteByQueryRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -583,7 +583,7 @@ public ExplainRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -303,7 +303,7 @@ public PutScriptRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -564,7 +564,7 @@ public ReindexRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

diff --git a/...ient/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java b/...ient/src/main/java/org/opensearch/client/opensearch/core/RenderSearchTemplateRequest.java
@@ -233,7 +233,7 @@ public RenderSearchTemplateRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -170,7 +170,7 @@ public ScrollRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -2249,7 +2249,7 @@ public SearchRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -670,7 +670,7 @@ public SearchTemplateRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -1365,7 +1365,7 @@ public UpdateByQueryRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -397,7 +397,7 @@ public CloneIndexRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -419,7 +419,7 @@ public CreateIndexRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -41,6 +41,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.opensearch._types.Time;
 import org.opensearch.client.util.ApiTypeHelper;
@@ -1108,7 +1109,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link IndexSettings}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettings> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexSettings>, PlainDeserializable<Builder> {
         @Nullable
         private IndexSettings index;
 
@@ -1919,6 +1920,10 @@ public final Builder knnAlgoParamEfSearch(@Nullable Integer value) {
             return this;
         }
 
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

diff --git a/...lient/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java b/...lient/src/main/java/org/opensearch/client/opensearch/indices/PutIndexTemplateRequest.java
@@ -381,7 +381,7 @@ public PutIndexTemplateRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -567,7 +567,7 @@ public PutTemplateRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

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
@@ -267,7 +267,7 @@ public UpdateAliasesRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }

diff --git a/...ava/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java b/...ava/org/opensearch/client/opensearch/indices/put_index_template/IndexTemplateMapping.java
@@ -41,6 +41,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.opensearch._types.mapping.TypeMapping;
 import org.opensearch.client.opensearch.indices.Alias;
@@ -139,7 +140,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
      * Builder for {@link IndexTemplateMapping}.
      */
 
-    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateMapping> {
+    public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexTemplateMapping>, PlainDeserializable<Builder> {
         @Nullable
         private Map<String, Alias> aliases;
 
@@ -219,6 +220,11 @@ public IndexTemplateMapping build() {
 
             return new IndexTemplateMapping(this);
         }
+
+        @Override
+        public Builder self() {
+            return this;
+        }
     }
 
     // ---------------------------------------------------------------------------------------------

diff --git a/...ent/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java b/...ent/src/main/java/org/opensearch/client/opensearch/nodes/ReloadSecureSettingsRequest.java
@@ -210,7 +210,7 @@ public ReloadSecureSettingsRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return null;
         }
     }

diff --git a/...client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java b/...client/src/main/java/org/opensearch/client/opensearch/snapshot/CreateSnapshotRequest.java
@@ -550,7 +550,7 @@ public CreateSnapshotRequest build() {
         }
 
         @Override
-        public Builder get() {
+        public Builder self() {
             return this;
         }
     }