From c1d3e9350cefaee7e8902ad2ca3fe4c53e49754f Mon Sep 17 00:00:00 2001
From: Sylvain Wallez <sylvain@elastic.co>
Date: Tue, 21 Jun 2022 11:00:26 +0200
Subject: [PATCH] Improve toString() (#320)

---
 .../elasticsearch/_types/GeoBounds.java       |  6 +++
 .../_types/GeoHashPrecision.java              |  6 +++
 .../elasticsearch/_types/GeoLocation.java     |  6 +++
 .../elasticsearch/_types/RequestBase.java     |  2 +-
 .../clients/elasticsearch/_types/Script.java  |  6 +++
 .../clients/elasticsearch/_types/Slices.java  |  6 +++
 .../elasticsearch/_types/SortOptions.java     |  5 ++
 .../clients/elasticsearch/_types/Time.java    |  6 +++
 .../elasticsearch/_types/Transform.java       |  6 +++
 .../_types/WaitForActiveShards.java           |  6 +++
 .../_types/aggregations/Aggregate.java        |  6 +++
 .../_types/aggregations/Aggregation.java      |  6 +++
 .../_types/aggregations/Buckets.java          |  5 ++
 .../_types/aggregations/BucketsPath.java      |  6 +++
 .../_types/aggregations/FieldDateMath.java    |  6 +++
 .../MovingAverageAggregation.java             |  6 +++
 .../_types/aggregations/Percentiles.java      |  6 +++
 .../_types/aggregations/TermsExclude.java     |  6 +++
 .../_types/aggregations/TermsInclude.java     |  6 +++
 .../_types/analysis/Analyzer.java             |  6 +++
 .../_types/analysis/CharFilter.java           |  6 +++
 .../_types/analysis/CharFilterDefinition.java |  6 +++
 .../_types/analysis/Normalizer.java           |  6 +++
 .../_types/analysis/TokenFilter.java          |  6 +++
 .../analysis/TokenFilterDefinition.java       |  6 +++
 .../_types/analysis/Tokenizer.java            |  6 +++
 .../_types/analysis/TokenizerDefinition.java  |  6 +++
 .../_types/mapping/Property.java              |  6 +++
 .../_types/query_dsl/FunctionScore.java       |  6 +++
 .../_types/query_dsl/Intervals.java           |  6 +++
 .../_types/query_dsl/IntervalsFilter.java     |  6 +++
 .../_types/query_dsl/IntervalsQuery.java      |  6 +++
 .../elasticsearch/_types/query_dsl/Like.java  |  6 +++
 .../_types/query_dsl/PinnedQuery.java         |  6 +++
 .../elasticsearch/_types/query_dsl/Query.java |  6 +++
 .../query_dsl/SimpleQueryStringFlags.java     |  6 +++
 .../_types/query_dsl/SpanQuery.java           |  6 +++
 .../_types/query_dsl/TermsQueryField.java     |  6 +++
 .../remote_info/ClusterRemoteInfo.java        |  6 +++
 .../core/bulk/BulkOperation.java              |  6 +++
 .../core/mget/MultiGetResponseItem.java       |  6 +++
 .../core/msearch/MultiSearchResponseItem.java |  6 +++
 .../elasticsearch/core/search/Context.java    |  6 +++
 .../core/search/FieldSuggester.java           |  6 +++
 .../core/search/HighlighterType.java          |  6 +++
 .../core/search/SmoothingModel.java           |  6 +++
 .../core/search/SourceConfig.java             |  6 +++
 .../core/search/SourceConfigParam.java        |  6 +++
 .../elasticsearch/core/search/Suggestion.java |  6 +++
 .../elasticsearch/core/search/TrackHits.java  |  6 +++
 .../explain_lifecycle/LifecycleExplain.java   |  6 +++
 .../rollover/IndexRolloverMapping.java        |  6 +++
 .../indices/update_aliases/Action.java        |  6 +++
 .../elasticsearch/ingest/Processor.java       |  6 +++
 .../ml/CategorizationAnalyzer.java            |  6 +++
 .../elasticsearch/ml/DataframeAnalysis.java   |  6 +++
 .../ml/DataframeAnalysisFeatureProcessor.java |  6 +++
 .../ml/DataframeAnalyticsStats.java           |  6 +++
 .../elasticsearch/ml/DataframeEvaluation.java |  6 +++
 .../ml/put_trained_model/Preprocessor.java    |  6 +++
 .../elasticsearch/nodes/NodeReloadResult.java |  6 +++
 .../elasticsearch/security/FieldRule.java     |  6 +++
 .../security/RoleMappingRule.java             |  6 +++
 .../elasticsearch/transform/PivotGroupBy.java |  6 +++
 .../transform/RetentionPolicy.java            |  6 +++
 .../clients/elasticsearch/transform/Sync.java |  6 +++
 .../elasticsearch/watcher/Condition.java      |  6 +++
 .../clients/elasticsearch/watcher/Input.java  |  6 +++
 .../elasticsearch/watcher/Schedule.java       |  6 +++
 .../elasticsearch/watcher/TimeOfDay.java      |  6 +++
 .../elasticsearch/watcher/Trigger.java        |  6 +++
 .../elasticsearch/watcher/TriggerEvent.java   |  6 +++
 .../co/elastic/clients/json/JsonpUtils.java   | 47 ++++++++++++-------
 .../elasticsearch/json/JsonpUtilsTest.java    |  5 +-
 .../elasticsearch/model/EndpointTest.java     |  6 +--
 .../spec_issues/SpecIssuesTest.java           | 14 ++++++
 76 files changed, 476 insertions(+), 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
index b935dfffd..552e336c6 100644
--- 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
index 6c4cba37c..de2957117 100644
--- 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
index 8e293753e..1022ff213 100644
--- 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
index ff17f62a4..e32f22b1e 100644
--- 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
index 9edd83199..1f2130c06 100644
--- 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
index 5c157e0aa..e56355c30 100644
--- 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
index 9cdf55ec6..b0f2093a3 100644
--- 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
index 1b1c20adc..5f60c44b5 100644
--- 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
index 52156fb78..edc3a56f6 100644
--- 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
index f6b8cae12..13c92591c 100644
--- 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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregate.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregate.java
index 3673741f3..a82952e56 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregate.java
+++ b/java-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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java
index 594cd0980..cbae14ded 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Aggregation.java
+++ b/java-client/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
index ce183829c..04d76ab30 100644
--- 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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java
index fc92e155a..4185ad060 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/BucketsPath.java
+++ b/java-client/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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/FieldDateMath.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/FieldDateMath.java
index de52dfd81..897859ac2 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/FieldDateMath.java
+++ b/java-client/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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MovingAverageAggregation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MovingAverageAggregation.java
index 06894c19a..cac22f199 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/MovingAverageAggregation.java
+++ b/java-client/src/main/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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Percentiles.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Percentiles.java
index d892b8197..c7d0facac 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/Percentiles.java
+++ b/java-client/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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java
index fbf7eedcd..425a2d200 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsExclude.java
+++ b/java-client/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/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsInclude.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsInclude.java
index 5cd823340..b9f13febc 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/aggregations/TermsInclude.java
+++ b/java-client/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
index d9eff0938..09f052c15 100644
--- 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
index 2d46ef360..dde25275d 100644
--- 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;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilterDefinition.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilterDefinition.java
index 9a08cebcf..d443657c8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilterDefinition.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/CharFilterDefinition.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;
@@ -215,6 +216,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<CharFilterDefinition> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java
index 3a4dc26a0..236794af3 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.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;
@@ -154,6 +155,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<Normalizer> {
 		private Kind _kind;
 		private NormalizerVariant _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilter.java
index f9adbc122..ad378e8e6 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilter.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<TokenFilter> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinition.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinition.java
index 26534b2cb..806dc5b96 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinition.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinition.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;
@@ -1043,6 +1044,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<TokenFilterDefinition> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Tokenizer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Tokenizer.java
index 33669d79a..551ea6818 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Tokenizer.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Tokenizer.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<Tokenizer> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenizerDefinition.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenizerDefinition.java
index 431eb4612..db698c8a4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenizerDefinition.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenizerDefinition.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;
@@ -385,6 +386,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<TokenizerDefinition> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/Property.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/Property.java
index 4184d3e8b..99b8013ed 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/Property.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/Property.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;
@@ -992,6 +993,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<Property> {
 		private Kind _kind;
 		private PropertyVariant _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/FunctionScore.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/FunctionScore.java
index 7d32ce042..b3efa906b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/FunctionScore.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/FunctionScore.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;
@@ -296,6 +297,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<FunctionScore> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Intervals.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Intervals.java
index 71253b944..7209e8935 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Intervals.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Intervals.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;
@@ -246,6 +247,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<Intervals> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsFilter.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsFilter.java
index 543cf35c8..acec93aaf 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsFilter.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsFilter.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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -298,6 +299,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<IntervalsFilter> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsQuery.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsQuery.java
index 96059fd7c..5a6c0757c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsQuery.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/IntervalsQuery.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;
@@ -260,6 +261,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends QueryBase.AbstractBuilder<Builder> implements ObjectBuilder<IntervalsQuery> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Like.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Like.java
index 6a27938d4..5e0dd0158 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Like.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Like.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;
@@ -139,6 +140,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Like> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/PinnedQuery.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/PinnedQuery.java
index 712c51357..2a2d65956 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/PinnedQuery.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/PinnedQuery.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;
@@ -203,6 +204,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends QueryBase.AbstractBuilder<Builder> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java
index dd218132b..6ee229a8d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.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;
@@ -1168,6 +1169,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<Query> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SimpleQueryStringFlags.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SimpleQueryStringFlags.java
index 6db9f85af..3a02dbc6b 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SimpleQueryStringFlags.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SimpleQueryStringFlags.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<SimpleQueryStringFlags> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SpanQuery.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SpanQuery.java
index 8e14fd876..1a0d588c7 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SpanQuery.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/SpanQuery.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;
@@ -314,6 +315,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<SpanQuery> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsQueryField.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsQueryField.java
index f2bf05b07..d4b81aacc 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsQueryField.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/TermsQueryField.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.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -141,6 +142,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TermsQueryField> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/remote_info/ClusterRemoteInfo.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/remote_info/ClusterRemoteInfo.java
index 54496c208..d75d4d8f4 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/remote_info/ClusterRemoteInfo.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/remote_info/ClusterRemoteInfo.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;
@@ -156,6 +157,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<ClusterRemoteInfo> {
 		private Kind _kind;
 		private ClusterRemoteInfoVariant _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/bulk/BulkOperation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/bulk/BulkOperation.java
index 1f3d38f86..0d00677d0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/bulk/BulkOperation.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/bulk/BulkOperation.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.NdJsonpSerializable;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -206,6 +207,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<BulkOperation> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/mget/MultiGetResponseItem.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/mget/MultiGetResponseItem.java
index f45620a68..3da6ad97e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/mget/MultiGetResponseItem.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/mget/MultiGetResponseItem.java
@@ -29,6 +29,7 @@
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.JsonpSerializer;
+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<TDocument> extends ObjectBuilderBase
 			implements
 				ObjectBuilder<MultiGetResponseItem<TDocument>> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/msearch/MultiSearchResponseItem.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/msearch/MultiSearchResponseItem.java
index ea7091e0e..6e13d69b5 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/msearch/MultiSearchResponseItem.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/msearch/MultiSearchResponseItem.java
@@ -29,6 +29,7 @@
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.JsonpSerializer;
+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<TDocument> extends ObjectBuilderBase
 			implements
 				ObjectBuilder<MultiSearchResponseItem<TDocument>> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Context.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Context.java
index 49b5550ba..41161906e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Context.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Context.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.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -142,6 +143,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<Context> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/FieldSuggester.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/FieldSuggester.java
index bca46bc9e..595adc3ed 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/FieldSuggester.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/FieldSuggester.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;
@@ -239,6 +240,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/core/search/HighlighterType.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/HighlighterType.java
index aa06e61fa..e73c624e8 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/HighlighterType.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/HighlighterType.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;
@@ -147,6 +148,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<HighlighterType> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SmoothingModel.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SmoothingModel.java
index dee5fcd70..bd7a1e718 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SmoothingModel.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SmoothingModel.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;
@@ -182,6 +183,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<SmoothingModel> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfig.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfig.java
index 557d81566..b4146313a 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfig.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfig.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;
@@ -137,6 +138,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<SourceConfig> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java
index fde68eae8..c9b2d7b9e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/SourceConfigParam.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<SourceConfigParam> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Suggestion.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Suggestion.java
index 95d234390..b643ef2c9 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Suggestion.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/Suggestion.java
@@ -30,6 +30,7 @@
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.JsonpSerializable;
 import co.elastic.clients.json.JsonpSerializer;
+import co.elastic.clients.json.JsonpUtils;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
 import co.elastic.clients.util.ObjectBuilder;
@@ -178,6 +179,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder<TDocument> extends ObjectBuilderBase implements ObjectBuilder<Suggestion<TDocument>> {
 		private Kind _kind;
 		private SuggestionVariant _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/TrackHits.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/TrackHits.java
index 3095e6600..307988d23 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/TrackHits.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/core/search/TrackHits.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;
@@ -156,6 +157,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<TrackHits> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ilm/explain_lifecycle/LifecycleExplain.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ilm/explain_lifecycle/LifecycleExplain.java
index 9e410c52c..58743b233 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ilm/explain_lifecycle/LifecycleExplain.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ilm/explain_lifecycle/LifecycleExplain.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;
@@ -156,6 +157,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<LifecycleExplain> {
 		private Kind _kind;
 		private LifecycleExplainVariant _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/rollover/IndexRolloverMapping.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/rollover/IndexRolloverMapping.java
index 4e5896229..88eb70e79 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/rollover/IndexRolloverMapping.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/rollover/IndexRolloverMapping.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.ObjectDeserializer;
 import co.elastic.clients.json.UnionDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -143,6 +144,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<IndexRolloverMapping> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/update_aliases/Action.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/update_aliases/Action.java
index 9b26a8708..5118558cd 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/update_aliases/Action.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/indices/update_aliases/Action.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;
@@ -181,6 +182,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<Action> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Processor.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Processor.java
index c04419e0d..9fba12347 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Processor.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ingest/Processor.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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -773,6 +774,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<Processor> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CategorizationAnalyzer.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CategorizationAnalyzer.java
index 5fd8ac8b6..f55b4fa3f 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CategorizationAnalyzer.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/CategorizationAnalyzer.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;
@@ -135,6 +136,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<CategorizationAnalyzer> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysis.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysis.java
index 72c28a883..c7c4d814d 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysis.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysis.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;
@@ -182,6 +183,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<DataframeAnalysis> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysisFeatureProcessor.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysisFeatureProcessor.java
index a4451cde0..489fa7bc0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysisFeatureProcessor.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalysisFeatureProcessor.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;
@@ -228,6 +229,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<DataframeAnalysisFeatureProcessor> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalyticsStats.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalyticsStats.java
index df3242888..b3b3de8ed 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalyticsStats.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeAnalyticsStats.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;
@@ -184,6 +185,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<DataframeAnalyticsStats> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeEvaluation.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeEvaluation.java
index 0d4879d50..944cd69d0 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeEvaluation.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/DataframeEvaluation.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;
@@ -182,6 +183,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<DataframeEvaluation> {
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/put_trained_model/Preprocessor.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/put_trained_model/Preprocessor.java
index 23ad3cf93..6b63789a6 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/put_trained_model/Preprocessor.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/ml/put_trained_model/Preprocessor.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;
@@ -184,6 +185,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<Preprocessor> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodeReloadResult.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodeReloadResult.java
index 581d8c2fc..ae603c4ec 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodeReloadResult.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/nodes/NodeReloadResult.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;
@@ -126,6 +127,11 @@ public void serialize(JsonGenerator generator, JsonpMapper mapper) {
 
 	}
 
+	@Override
+	public String toString() {
+		return JsonpUtils.toString(this);
+	}
+
 	public static class Builder extends ObjectBuilderBase implements ObjectBuilder<NodeReloadResult> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/FieldRule.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/FieldRule.java
index 3ff938624..a53705b46 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/FieldRule.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/FieldRule.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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -257,6 +258,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<FieldRule> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/RoleMappingRule.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/RoleMappingRule.java
index 4b534026c..694748dad 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/security/RoleMappingRule.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/security/RoleMappingRule.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;
@@ -232,6 +233,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<RoleMappingRule> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/PivotGroupBy.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/PivotGroupBy.java
index d78d92aaf..5aa275679 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/PivotGroupBy.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/PivotGroupBy.java
@@ -32,6 +32,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;
@@ -204,6 +205,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<PivotGroupBy> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/RetentionPolicy.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/RetentionPolicy.java
index ff7d2bff2..bd9295816 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/RetentionPolicy.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/RetentionPolicy.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;
@@ -143,6 +144,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<RetentionPolicy> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Sync.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Sync.java
index 88941172d..1f5375204 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Sync.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/transform/Sync.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;
@@ -141,6 +142,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<Sync> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Condition.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Condition.java
index f524c4594..e0e61774e 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Condition.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Condition.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;
@@ -219,6 +220,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<Condition> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Input.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Input.java
index 5b9bab32b..01101980c 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Input.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Input.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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -214,6 +215,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<Input> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java
index 4e9fac86e..fb906fdca 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Schedule.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.ObjectBuilderDeserializer;
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ApiTypeHelper;
@@ -302,6 +303,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<Schedule> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TimeOfDay.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TimeOfDay.java
index e958cfcd9..6df492979 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TimeOfDay.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TimeOfDay.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<TimeOfDay> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Trigger.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Trigger.java
index c7bec1bef..c5e058031 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Trigger.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/Trigger.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;
@@ -141,6 +142,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<Trigger> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TriggerEvent.java b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TriggerEvent.java
index a1f716d35..c16ba9da3 100644
--- a/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TriggerEvent.java
+++ b/java-client/src/main/java/co/elastic/clients/elasticsearch/watcher/TriggerEvent.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;
@@ -143,6 +144,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<TriggerEvent> {
 		private Kind _kind;
 		private Object _value;
diff --git a/java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java b/java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java
index 646cb6679..be674555c 100644
--- a/java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java
+++ b/java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java
@@ -242,22 +242,39 @@ public static void serializeIntOrNull(JsonGenerator generator, int value, int de
     }
 
     /**
-     * Renders a <code>JsonpSerializable</code> as a string by serializing it to JSON. Any object of an application-specific
-     * class in the object graph is rendered using that object's <code>toString()</code> representation as a JSON string value.
+     * Renders a <code>JsonpSerializable</code> as a string by serializing it to JSON, prefixed by the class name. Any object of an
+     * application-specific class in the object graph is rendered using that object's <code>toString()</code> representation as a JSON
+     * string value.
      * <p>
-     * The size of the string is limited to {@link #MAX_TO_STRING_LENGTH}.
+     * The size of the string is limited to {@link #maxToStringLength()}.
      *
-     * @see #MAX_TO_STRING_LENGTH
+     * @see #maxToStringLength()
      */
     public static String toString(JsonpSerializable value) {
-        return toString(value, ToStringMapper.INSTANCE, new StringBuilder()).toString();
+        StringBuilder sb = new StringBuilder(value.getClass().getSimpleName()).append(": ");
+        return toString(value, ToStringMapper.INSTANCE, sb).toString();
     }
 
     /**
-     * Maximum length of the <code>toString</code> representation of a <code>JsonpSerializable</code>.
-     * <p>
-     * The default is 10k characters, and can be changed globally by changing the value of this field.
+     * Set the maximum length of the JSON representation of a <code>JsonpSerializable</code> in the result of its <code>toString()</code>
+     * method. The default is 10k characters.
+     */
+    public static void maxToStringLength(int length) {
+        MAX_TO_STRING_LENGTH = length;
+    }
+
+    /**
+     * Get the maximum length of the JSON representation of a <code>JsonpSerializable</code> in the result of its <code>toString()</code>
+     * method. The default is 10k characters.
      */
+    public static int maxToStringLength() {
+        return MAX_TO_STRING_LENGTH;
+    }
+
+    /**
+     * @deprecated use {@link #maxToStringLength(int)}
+     */
+    @Deprecated
     public static int MAX_TO_STRING_LENGTH = 10000;
 
     private static class ToStringTooLongException extends RuntimeException {
@@ -266,18 +283,18 @@ private static class ToStringTooLongException extends RuntimeException {
     /**
      * Renders a <code>JsonpSerializable</code> as a string in a destination <code>StringBuilder</code>by serializing it to JSON.
      * <p>
-     * The size of the string is limited to {@link #MAX_TO_STRING_LENGTH}.
+     * The size of the string is limited to {@link #maxToStringLength()}.
      *
      * @return the <code>dest</code> parameter, for chaining.
      * @see #toString(JsonpSerializable)
-     * @see #MAX_TO_STRING_LENGTH
+     * @see #maxToStringLength()
      */
     public static StringBuilder toString(JsonpSerializable value, JsonpMapper mapper, StringBuilder dest) {
         Writer writer = new Writer() {
             int length = 0;
             @Override
             public void write(char[] cbuf, int off, int len) {
-                int max = MAX_TO_STRING_LENGTH;
+                int max = maxToStringLength();
                 length += len;
                 if (length > max) {
                     dest.append(cbuf, off, len - (length - max));
@@ -297,10 +314,8 @@ public void close() {
             }
         };
 
-        JsonGenerator generator = mapper.jsonProvider().createGenerator(writer);
-        try {
+        try(JsonGenerator generator = mapper.jsonProvider().createGenerator(writer)) {
             value.serialize(generator, mapper);
-            generator.close();
         } catch (ToStringTooLongException e) {
             // Ignore
         }
@@ -312,11 +327,11 @@ public void close() {
      * Any object of an application-specific class in the object graph is rendered using that object's <code>toString()</code>
      * representation as a JSON string value.
      * <p>
-     * The size of the string is limited to {@link #MAX_TO_STRING_LENGTH}.
+     * The size of the string is limited to {@link #maxToStringLength()}.
      *
      * @return the <code>dest</code> parameter, for chaining.
      * @see #toString(JsonpSerializable)
-     * @see #MAX_TO_STRING_LENGTH
+     * @see #maxToStringLength()
      */
     public static StringBuilder toString(JsonpSerializable value, StringBuilder dest) {
         return toString(value, ToStringMapper.INSTANCE, dest);
diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpUtilsTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpUtilsTest.java
index 851dcc4fc..a5dbd4826 100644
--- a/java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpUtilsTest.java
+++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/json/JsonpUtilsTest.java
@@ -73,7 +73,7 @@ public void testObjectToString() {
             .index("idx")
             .id("id1")
         );
-        assertEquals("{\"_index\":\"idx\",\"_id\":\"id1\",\"_source\":\"Some user data\"}", hit.toString());
+        assertEquals("Hit: {\"_index\":\"idx\",\"_id\":\"id1\",\"_source\":\"Some user data\"}", hit.toString());
     }
 
     private static class SomeUserData {
@@ -102,7 +102,8 @@ public void testLargeObjectToString() {
 
         String toString = hit.toString();
 
-        assertEquals(10003, toString.length());
+        assertEquals(10000 + "Hit: ".length() + "...".length(), toString.length());
+        assertTrue(toString.startsWith("Hit: "));
         assertTrue(toString.endsWith("..."));
     }
 
diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/model/EndpointTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/model/EndpointTest.java
index 1ccf7f5c8..1358d7a03 100644
--- a/java-client/src/test/java/co/elastic/clients/elasticsearch/model/EndpointTest.java
+++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/model/EndpointTest.java
@@ -78,16 +78,16 @@ public void testArrayQueryParameter() {
     @Test
     public void testRequestToString() {
         // Simple path, no parameters, no body
-        assertEquals("GET /", InfoRequest._INSTANCE.toString());
+        assertEquals("InfoRequest: GET /", InfoRequest._INSTANCE.toString());
 
         // Complex path, parameters, no body
         assertEquals(
-            "HEAD /idx/_doc/id1?preference=foo&refresh=true",
+            "ExistsRequest: HEAD /idx/_doc/id1?preference=foo&refresh=true",
             ExistsRequest.of(b -> b.index("idx").id("id1").preference("foo").refresh(true)).toString()
         );
 
         assertEquals(
-            "POST /idx/_search?typed_keys=true {\"size\":10}",
+            "SearchRequest: POST /idx/_search?typed_keys=true {\"size\":10}",
             SearchRequest.of(s -> s.index("idx").size(10)).toString()
         );
     }
diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java
index 5662f8c2b..beb5b96c5 100644
--- a/java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java
+++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/spec_issues/SpecIssuesTest.java
@@ -19,11 +19,14 @@
 
 package co.elastic.clients.elasticsearch.spec_issues;
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch.ElasticsearchTestServer;
 import co.elastic.clients.elasticsearch._types.ErrorResponse;
 import co.elastic.clients.elasticsearch.cluster.ClusterStatsResponse;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
+import co.elastic.clients.elasticsearch.indices.GetFieldMappingRequest;
+import co.elastic.clients.elasticsearch.indices.GetFieldMappingResponse;
 import co.elastic.clients.elasticsearch.model.ModelTestCase;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -39,6 +42,17 @@
  */
 public class SpecIssuesTest extends ModelTestCase {
 
+    @Test
+    public void i066_multiFieldMapping() throws Exception {
+        ElasticsearchClient client = ElasticsearchTestServer.global().client();
+
+        GetFieldMappingRequest gfmRequest =  new GetFieldMappingRequest.Builder()
+            .index("*")
+            .fields("*")
+            .build();
+        GetFieldMappingResponse gfmResponse = client.indices().getFieldMapping(gfmRequest);
+    }
+
     @Test
     public void i0107_rangeBucketKey() {
         // https://github.com/elastic/elasticsearch-java/issues/107