Avoid indented formatting for IStreamSerializable

stevejgordon · stevejgordon · commit 192362d7ee1f · 2023-03-01T09:35:29.000Z
diff --git a/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs
@@ -34,11 +34,14 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri
 		foreach (var op in Operations)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
 			op.PrepareIndex(index);
 
-			serializable.Serialize(stream, settings, formatting);
+			serializable.Serialize(stream, settings, SerializationFormatting.None);
 			stream.WriteByte((byte)'\n');
 		}
 	}
@@ -53,11 +56,14 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set
 		foreach (var op in Operations)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
 			op.PrepareIndex(index);
 
-			await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);
+			await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);
 			stream.WriteByte((byte)'\n');
 		}
 	}
@@ -200,11 +206,14 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri
 		foreach (var op in _operations)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
 			op.PrepareIndex(index);
 
-			serializable.Serialize(stream, settings, formatting);
+			serializable.Serialize(stream, settings, SerializationFormatting.None);
 			stream.WriteByte((byte)'\n');
 		}
 	}
@@ -219,11 +228,14 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set
 		foreach (var op in _operations)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
 			op.PrepareIndex(index);
 
-			await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);
+			await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);
 			stream.WriteByte((byte)'\n');
 		}
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/Core/Exceptions/ThrowHelper.cs b/src/Elastic.Clients.Elasticsearch/Core/Exceptions/ThrowHelper.cs
@@ -28,4 +28,7 @@ internal static void ThrowInvalidOperationException(string message) =>
 
 	[MethodImpl(MethodImplOptions.NoInlining)]
 	internal static void ThrowJsonExceptionForMissingSettings() => throw new JsonException("Unable to retrieve client settings for JsonSerializerOptions.");
+
+	[MethodImpl(MethodImplOptions.NoInlining)]
+	internal static void ThrowInvalidOperationForBulkWhenNotIStreamSerializable() => throw new InvalidOperationException("Operation must implement IStreamSerializable.");
 }
diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/DefaultRequestResponseSerializer.cs b/src/Elastic.Clients.Elasticsearch/Serialization/DefaultRequestResponseSerializer.cs
@@ -60,7 +60,7 @@ public override void Serialize<T>(T data, Stream writableStream,
 	{
 		if (data is IStreamSerializable streamSerializable)
 		{
-			streamSerializable.Serialize(writableStream, _settings, formatting);
+			streamSerializable.Serialize(writableStream, _settings, SerializationFormatting.None);
 			return;
 		}
 
@@ -73,7 +73,7 @@ public override Task SerializeAsync<T>(T data, Stream stream,
 	{
 		if (data is IStreamSerializable streamSerializable)
 		{
-			return streamSerializable.SerializeAsync(stream, _settings, formatting);
+			return streamSerializable.SerializeAsync(stream, _settings, SerializationFormatting.None);
 		}
 
 		return base.SerializeAsync(data, stream, formatting, cancellationToken);
diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/IStreamSerializable.cs b/src/Elastic.Clients.Elasticsearch/Serialization/IStreamSerializable.cs
@@ -9,7 +9,7 @@
 namespace Elastic.Clients.Elasticsearch.Serialization;
 
 /// <summary>
-/// Used to mark types which expect to directly serialise into a stream. This supports non-json compliant output such as NDJSON.
+/// Used to mark types which expect to directly serialize into a stream. This supports non-json compliant output such as NDJSON.
 /// </summary>
 internal interface IStreamSerializable
 {
diff --git a/src/Elastic.Clients.Elasticsearch/Types/Core/Bulk/BulkOperationsCollection.cs b/src/Elastic.Clients.Elasticsearch/Types/Core/Bulk/BulkOperationsCollection.cs
@@ -235,9 +235,12 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri
 		foreach (var op in this)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
-			serializable.Serialize(stream, settings, formatting);
+			serializable.Serialize(stream, settings, SerializationFormatting.None);
 			stream.WriteByte((byte)'\n');
 		}
 	}
@@ -247,9 +250,12 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set
 		foreach (var op in this)
 		{
 			if (op is not IStreamSerializable serializable)
-				throw new InvalidOperationException("");
+			{
+				ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();
+				return;
+			}
 
-			await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);
+			await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);
 			stream.WriteByte((byte)'\n');
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,14 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri`
`34`	`34`	`foreach (var op in Operations)`
`35`	`35`	`{`
`36`	`36`	`if (op is not IStreamSerializable serializable)`
`37`		`- throw new InvalidOperationException("");`
	`37`	`+ {`
	`38`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`39`	`+ return;`
	`40`	`+ }`
`38`	`41`
`39`	`42`	`op.PrepareIndex(index);`
`40`	`43`
`41`		`- serializable.Serialize(stream, settings, formatting);`
	`44`	`+ serializable.Serialize(stream, settings, SerializationFormatting.None);`
`42`	`45`	`stream.WriteByte((byte)'\n');`
`43`	`46`	`}`
`44`	`47`	`}`
`@@ -53,11 +56,14 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set`
`53`	`56`	`foreach (var op in Operations)`
`54`	`57`	`{`
`55`	`58`	`if (op is not IStreamSerializable serializable)`
`56`		`- throw new InvalidOperationException("");`
	`59`	`+ {`
	`60`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`61`	`+ return;`
	`62`	`+ }`
`57`	`63`
`58`	`64`	`op.PrepareIndex(index);`
`59`	`65`
`60`		`- await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);`
	`66`	`+ await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);`
`61`	`67`	`stream.WriteByte((byte)'\n');`
`62`	`68`	`}`
`63`	`69`	`}`
`@@ -200,11 +206,14 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri`
`200`	`206`	`foreach (var op in _operations)`
`201`	`207`	`{`
`202`	`208`	`if (op is not IStreamSerializable serializable)`
`203`		`- throw new InvalidOperationException("");`
	`209`	`+ {`
	`210`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`211`	`+ return;`
	`212`	`+ }`
`204`	`213`
`205`	`214`	`op.PrepareIndex(index);`
`206`	`215`
`207`		`- serializable.Serialize(stream, settings, formatting);`
	`216`	`+ serializable.Serialize(stream, settings, SerializationFormatting.None);`
`208`	`217`	`stream.WriteByte((byte)'\n');`
`209`	`218`	`}`
`210`	`219`	`}`
`@@ -219,11 +228,14 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set`
`219`	`228`	`foreach (var op in _operations)`
`220`	`229`	`{`
`221`	`230`	`if (op is not IStreamSerializable serializable)`
`222`		`- throw new InvalidOperationException("");`
	`231`	`+ {`
	`232`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`233`	`+ return;`
	`234`	`+ }`
`223`	`235`
`224`	`236`	`op.PrepareIndex(index);`
`225`	`237`
`226`		`- await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);`
	`238`	`+ await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);`
`227`	`239`	`stream.WriteByte((byte)'\n');`
`228`	`240`	`}`
`229`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,7 @@ internal static void ThrowInvalidOperationException(string message) =>`
`28`	`28`
`29`	`29`	`[MethodImpl(MethodImplOptions.NoInlining)]`
`30`	`30`	`internal static void ThrowJsonExceptionForMissingSettings() => throw new JsonException("Unable to retrieve client settings for JsonSerializerOptions.");`
	`31`	`+`
	`32`	`+ [MethodImpl(MethodImplOptions.NoInlining)]`
	`33`	`+ internal static void ThrowInvalidOperationForBulkWhenNotIStreamSerializable() => throw new InvalidOperationException("Operation must implement IStreamSerializable.");`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public override void Serialize<T>(T data, Stream writableStream,`
`60`	`60`	`{`
`61`	`61`	`if (data is IStreamSerializable streamSerializable)`
`62`	`62`	`{`
`63`		`- streamSerializable.Serialize(writableStream, _settings, formatting);`
	`63`	`+ streamSerializable.Serialize(writableStream, _settings, SerializationFormatting.None);`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`
`@@ -73,7 +73,7 @@ public override Task SerializeAsync<T>(T data, Stream stream,`
`73`	`73`	`{`
`74`	`74`	`if (data is IStreamSerializable streamSerializable)`
`75`	`75`	`{`
`76`		`- return streamSerializable.SerializeAsync(stream, _settings, formatting);`
	`76`	`+ return streamSerializable.SerializeAsync(stream, _settings, SerializationFormatting.None);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`return base.SerializeAsync(data, stream, formatting, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace Elastic.Clients.Elasticsearch.Serialization;`
`10`	`10`
`11`	`11`	`/// <summary>`
`12`		`-/// Used to mark types which expect to directly serialise into a stream. This supports non-json compliant output such as NDJSON.`
	`12`	`+/// Used to mark types which expect to directly serialize into a stream. This supports non-json compliant output such as NDJSON.`
`13`	`13`	`/// </summary>`
`14`	`14`	`internal interface IStreamSerializable`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,12 @@ public void Serialize(Stream stream, IElasticsearchClientSettings settings, Seri`
`235`	`235`	`foreach (var op in this)`
`236`	`236`	`{`
`237`	`237`	`if (op is not IStreamSerializable serializable)`
`238`		`- throw new InvalidOperationException("");`
	`238`	`+ {`
	`239`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`240`	`+ return;`
	`241`	`+ }`
`239`	`242`
`240`		`- serializable.Serialize(stream, settings, formatting);`
	`243`	`+ serializable.Serialize(stream, settings, SerializationFormatting.None);`
`241`	`244`	`stream.WriteByte((byte)'\n');`
`242`	`245`	`}`
`243`	`246`	`}`
`@@ -247,9 +250,12 @@ public async Task SerializeAsync(Stream stream, IElasticsearchClientSettings set`
`247`	`250`	`foreach (var op in this)`
`248`	`251`	`{`
`249`	`252`	`if (op is not IStreamSerializable serializable)`
`250`		`- throw new InvalidOperationException("");`
	`253`	`+ {`
	`254`	`+ ThrowHelper.ThrowInvalidOperationForBulkWhenNotIStreamSerializable();`
	`255`	`+ return;`
	`256`	`+ }`
`251`	`257`
`252`		`- await serializable.SerializeAsync(stream, settings, formatting).ConfigureAwait(false);`
	`258`	`+ await serializable.SerializeAsync(stream, settings, SerializationFormatting.None).ConfigureAwait(false);`
`253`	`259`	`stream.WriteByte((byte)'\n');`
`254`	`260`	`}`
`255`	`261`	`}`