588 - [ENHANCEMENT] New interface PlainJsonSerializable and optimizin…

…g imports Signed-off-by: Jai2305 <[email protected]>
opensearch-project · Jul 9, 2024 · 5ff4a6f · 5ff4a6f
1 parent ce514fc
commit 5ff4a6f
Show file tree

Hide file tree

Showing 602 changed files with 1,262 additions and 1,225 deletions.
diff --git 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/...ent/src/generated/java/org/opensearch/client/opensearch/_types/OpenSearchVersionInfo.java b/...ent/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
@@ -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
@@ -33,34 +33,11 @@
 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
  */
 public interface JsonpSerializable {
 
     void serialize(JsonGenerator generator, JsonpMapper mapper);
-
-    /**
-     * A default method which returns string representation for the instances of classes
-     * implementing JsonpSerializable interface.<br>
-     * Usage : Eg for SearchRequest.class<pre>{@code SearchRequest implements JsonpSerializable{..}
-     * SearchRequest searchRequest = SearchRequest.of(request -> request...);
-     * String searchRequestString = searchRequest.writeValueAsString();}</pre>  <br>
-     *
-     */
-    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
@@ -82,14 +82,14 @@ public <T> 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 <T> JsonpDeserializer<T> getDefaultDeserializer(Class<T> 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
@@ -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.<br>
+     * Usage : Eg for SearchRequest.class<pre>{@code SearchRequest implements PlainJsonSerializable{..}
+     * SearchRequest searchRequest = SearchRequest.of(request -> request...);
+     * String searchRequestString = searchRequest.writeValueAsString();}</pre>  <br>
+     *
+     */
+    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/...lient/src/main/java/org/opensearch/client/opensearch/_types/AcknowledgedResponseBase.java b/...lient/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
@@ -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<String, String> attributes;
 
     private final String host;

diff --git a/...lient/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java b/...lient/src/main/java/org/opensearch/client/opensearch/_types/BulkIndexByScrollFailure.java
@@ -37,17 +37,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -38,17 +38,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -37,17 +37,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -39,17 +39,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -37,17 +37,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -37,17 +37,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.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
@@ -36,15 +36,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.PlainJsonSerializable;
 import org.opensearch.client.util.ObjectBuilder;
 
 /**
  * For empty Class assignments
  *
  */
 @JsonpDeserializable
-public class EmptyObject implements JsonpSerializable {
+public class EmptyObject implements PlainJsonSerializable {
 
     public static final class Builder implements ObjectBuilder<EmptyObject> {
         @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
@@ -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<EmptyTransform> {
         @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
@@ -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<String, JsonData> 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
@@ -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
@@ -38,17 +38,17 @@
 import org.opensearch.client.json.JsonpDeserializable;
 import org.opensearch.client.json.JsonpDeserializer;
 import org.opensearch.client.json.JsonpMapper;
-import org.opensearch.client.json.JsonpSerializable;
 import org.opensearch.client.json.ObjectBuilderDeserializer;
 import org.opensearch.client.json.ObjectDeserializer;
+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.FieldMemoryUsage
 
 @JsonpDeserializable
-public class FieldMemoryUsage implements JsonpSerializable {
+public class FieldMemoryUsage implements PlainJsonSerializable {
     @Nullable
     private final String memorySize;