Improve toString() (#320)

elastic · Jun 21, 2022 · c1d3e93 · c1d3e93
1 parent 69e4218
commit c1d3e93
Show file tree

Hide file tree

Showing 76 changed files with 476 additions and 22 deletions.
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoBounds.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoBounds.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -167,6 +168,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoBounds> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoHashPrecision.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoHashPrecision.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -153,6 +154,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoHashPrecision> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoLocation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/GeoLocation.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -188,6 +189,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<GeoLocation> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/RequestBase.java
@@ -53,7 +53,7 @@ public RequestBase() {
 	@Override
 	public String toString() {
 
-		StringBuilder sb = new StringBuilder();
+		StringBuilder sb = new StringBuilder(this.getClass().getSimpleName()).append(": ");
 
 		try {
 			@SuppressWarnings("unchecked")

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Script.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Script.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -125,6 +126,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Script> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Slices.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Slices.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -146,6 +147,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Slices> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java
@@ -225,6 +225,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 		}
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<SortOptions> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Time.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Time.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -155,6 +156,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Time> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Transform.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/Transform.java
@@ -28,6 +28,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -192,6 +193,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Transform> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/WaitForActiveShards.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/WaitForActiveShards.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -146,6 +147,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<WaitForActiveShards> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregate.java b/...-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregate.java
@@ -29,6 +29,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
@@ -1385,6 +1386,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Aggregate> {
 		private Kind _kind;
 		private AggregateVariant _value;

diff --git a/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java b/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java
@@ -30,6 +30,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -1502,6 +1503,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Buckets.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Buckets.java
@@ -158,6 +158,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder<TBucket> extends ObjectBuilderBase implements ObjectBuilder<Buckets<TBucket>> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java b/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -176,6 +177,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<BucketsPath> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...ent/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/FieldDateMath.java b/...ent/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/FieldDateMath.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -154,6 +155,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<FieldDateMath> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...n/java/co/elastic/clients/elasticsearch/_types/aggregations/MovingAverageAggregation.java b/...n/java/co/elastic/clients/elasticsearch/_types/aggregations/MovingAverageAggregation.java
@@ -28,6 +28,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -213,6 +214,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends WithJsonObjectBuilderBase<Builder>
 			implements
 				ObjectBuilder<MovingAverageAggregation> {

diff --git a/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Percentiles.java b/...lient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Percentiles.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -152,6 +153,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Percentiles> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...ient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java b/...ient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -158,6 +159,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsExclude> {
 		private Kind _kind;
 		private Object _value;

diff --git a/...ient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsInclude.java b/...ient/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsInclude.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -162,6 +163,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsInclude> {
 		private Kind _kind;
 		private Object _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Analyzer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Analyzer.java
@@ -28,6 +28,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -379,6 +380,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Analyzer> {
 		private Kind _kind;
 		private AnalyzerVariant _value;

diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilter.java
@@ -27,6 +27,7 @@
 import co.elastic.clients.json.JsonpDeserializer;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -134,6 +135,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CharFilter> {
 		private Kind _kind;
 		private Object _value;