fix places where IMemoryStreamFactory was being side stepped (#3650)

Mpdreamz · russcam · commit ad8ba6aa8819 · 2019-04-12T12:20:53.000+10:00
fix places where IMemoryStreamFactory was being side stepped and MemoryStreams were being new'ed directly
diff --git a/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs b/src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs
@@ -166,7 +166,7 @@ protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection co
 		TimeSpan? IConnectionConfigurationValues.MaxDeadTimeout => _maxDeadTimeout;
 		int? IConnectionConfigurationValues.MaxRetries => _maxRetries;
 		TimeSpan? IConnectionConfigurationValues.MaxRetryTimeout => _maxRetryTimeout;
-		IMemoryStreamFactory IConnectionConfigurationValues.MemoryStreamFactory { get; } = new RecyclableMemoryStreamFactory();
+		IMemoryStreamFactory IConnectionConfigurationValues.MemoryStreamFactory { get; } = RecyclableMemoryStreamFactory.Default;
 
 		Func<Node, bool> IConnectionConfigurationValues.NodePredicate => _nodePredicate;
 		Action<IApiCallDetails> IConnectionConfigurationValues.OnRequestCompleted => _completedRequestHandler;
diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamFactory.cs
@@ -9,6 +9,8 @@ public class RecyclableMemoryStreamFactory : IMemoryStreamFactory
 	{
 		private readonly RecyclableMemoryStreamManager _manager;
 
+		public static RecyclableMemoryStreamFactory Default { get; } = new RecyclableMemoryStreamFactory();
+
 		public RecyclableMemoryStreamFactory() =>
 			_manager = new RecyclableMemoryStreamManager { AggressiveBufferReturn = true };
 
diff --git a/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs b/src/Elasticsearch.Net/Responses/ElasticsearchResponse.cs
@@ -33,6 +33,9 @@ public abstract class ElasticsearchResponseBase : IApiCallDetails, IElasticsearc
 		/// <inheritdoc cref="IApiCallDetails.Uri"/>
 		public Uri Uri => ApiCall.Uri;
 
+		/// <inheritdoc cref="IApiCallDetails.ConnectionConfiguration"/>
+		public IConnectionConfigurationValues ConnectionConfiguration => ApiCall.ConnectionConfiguration;
+
 		/// <inheritdoc cref="IApiCallDetails.ResponseBodyInBytes"/>
 		public byte[] ResponseBodyInBytes => ApiCall.ResponseBodyInBytes;
 
diff --git a/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs b/src/Elasticsearch.Net/Responses/HttpDetails/ApiCallDetails.cs
@@ -36,6 +36,8 @@ public string DebugInformation
 
 		public Uri Uri { get; set; }
 
+		public IConnectionConfigurationValues ConnectionConfiguration { get; set; }
+
 		public override string ToString() =>
 			$"{(Success ? "S" : "Uns")}uccessful low level call on {HttpMethod.GetStringValue()}: {Uri.PathAndQuery}";
 	}
diff --git a/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs b/src/Elasticsearch.Net/Responses/HttpDetails/IApiCallDetails.cs
@@ -22,6 +22,11 @@ public interface IApiCallDetails
         /// </summary>
         string DebugInformation { get; }
 
+		/// <summary>
+		/// Reference to the connection configuration that yielded this response
+		/// </summary>
+		IConnectionConfigurationValues ConnectionConfiguration { get; }
+
 		/// <summary>
 		/// A collection of deprecation warnings returned from Elasticsearch.
 		/// <para>Used to signal that the request uses an API feature that is marked as deprecated</para>
diff --git a/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs b/src/Elasticsearch.Net/Responses/Special/BytesResponse.cs
@@ -15,7 +15,7 @@ public bool TryGetServerError(out ServerError serverError)
 			if (Body == null || Body.Length == 0 || ResponseMimeType != RequestData.MimeType)
 				return false;
 
-			using(var stream = new MemoryStream(Body))
+			using(var stream = ConnectionConfiguration.MemoryStreamFactory.Create(Body))
 				return ServerError.TryCreate(stream, out serverError);
 		}
 
diff --git a/src/Elasticsearch.Net/Responses/Special/StringResponse.cs b/src/Elasticsearch.Net/Responses/Special/StringResponse.cs
@@ -16,7 +16,7 @@ public bool TryGetServerError(out ServerError serverError)
 			if (string.IsNullOrEmpty(Body) || ResponseMimeType != RequestData.MimeType)
 				return false;
 
-			using(var stream = new MemoryStream(Encoding.UTF8.GetBytes(Body)))
+			using(var stream = ConnectionConfiguration.MemoryStreamFactory.Create(Encoding.UTF8.GetBytes(Body)))
 				return ServerError.TryCreate(stream, out serverError);
 		}
 
diff --git a/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs b/src/Elasticsearch.Net/Serialization/IElasticsearchSerializer.cs
@@ -11,33 +11,40 @@ public interface IElasticsearchSerializer
 
 		T Deserialize<T>(Stream stream);
 
-		Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default(CancellationToken));
+		Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default);
 
-		Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken));
+		Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default);
 
 		void Serialize<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented);
 
 		Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented,
-			CancellationToken cancellationToken = default(CancellationToken)
+			CancellationToken cancellationToken = default
 		);
 	}
 
 	public static class ElasticsearchSerializerExtensions
 	{
-		public static byte[] SerializeToBytes<T>(this IElasticsearchSerializer serializer, T data,
+		public static byte[] SerializeToBytes<T>(
+			this IElasticsearchSerializer serializer,
+			T data,
+			IMemoryStreamFactory memoryStreamFactory = null,
 			SerializationFormatting formatting = SerializationFormatting.Indented
 		)
 		{
-			using (var ms = new MemoryStream())
+			memoryStreamFactory = memoryStreamFactory ?? RecyclableMemoryStreamFactory.Default;
+			using (var ms = memoryStreamFactory.Create())
 			{
 				serializer.Serialize(data, ms, formatting);
 				return ms.ToArray();
 			}
 		}
 
-		public static string SerializeToString<T>(this IElasticsearchSerializer serializer, T data,
+		public static string SerializeToString<T>(
+			this IElasticsearchSerializer serializer,
+			T data,
+			IMemoryStreamFactory memoryStreamFactory = null,
 			SerializationFormatting formatting = SerializationFormatting.Indented
 		) =>
-			serializer.SerializeToBytes(data, formatting).Utf8String();
+			serializer.SerializeToBytes(data, memoryStreamFactory, formatting).Utf8String();
 	}
 }
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs b/src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs
@@ -135,7 +135,7 @@ ElasticsearchClientException exception
 			if (response == null)
 			{
 				//make sure we copy over the error body in case we disabled direct streaming.
-				var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : new MemoryStream(callDetails.ResponseBodyInBytes);
+				var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : _memoryStreamFactory.Create(callDetails.ResponseBodyInBytes);
 				var m = callDetails?.ResponseMimeType ?? RequestData.MimeType;
 				response = ResponseBuilder.ToResponse<TResponse>(data, exception, callDetails?.HttpStatusCode, null, s, m);
 			}
diff --git a/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs b/src/Elasticsearch.Net/Transport/Pipeline/ResponseBuilder.cs
@@ -70,7 +70,8 @@ private static ApiCallDetails Initialize(
 				Uri = requestData.Uri,
 				HttpMethod = requestData.Method,
 				DeprecationWarnings = warnings ?? Enumerable.Empty<string>(),
-				ResponseMimeType = mimeType
+				ResponseMimeType = mimeType,
+				ConnectionConfiguration = requestData.ConnectionSettings
 			};
 			return details;
 		}
@@ -90,7 +91,7 @@ private static TResponse SetBody<TResponse>(ApiCallDetails details, RequestData
 
 			using (responseStream)
 			{
-				if (SetSpecialTypes<TResponse>(requestData, bytes, out var r))
+				if (SetSpecialTypes<TResponse>(bytes, requestData.MemoryStreamFactory, out var r))
 					return r;
 
 				if (details.HttpStatusCode.HasValue && requestData.SkipDeserializationForStatusCodes.Contains(details.HttpStatusCode.Value))
@@ -121,7 +122,7 @@ private static async Task<TResponse> SetBodyAsync<TResponse>(
 
 			using (responseStream)
 			{
-				if (SetSpecialTypes<TResponse>(requestData, bytes, out var r)) return r;
+				if (SetSpecialTypes<TResponse>(bytes, requestData.MemoryStreamFactory, out var r)) return r;
 
 				if (details.HttpStatusCode.HasValue && requestData.SkipDeserializationForStatusCodes.Contains(details.HttpStatusCode.Value))
 					return null;
@@ -136,7 +137,7 @@ private static async Task<TResponse> SetBodyAsync<TResponse>(
 			}
 		}
 
-		private static bool SetSpecialTypes<TResponse>(RequestData requestData, byte[] bytes, out TResponse cs)
+		private static bool SetSpecialTypes<TResponse>(byte[] bytes, IMemoryStreamFactory memoryStreamFactory, out TResponse cs)
 			where TResponse : class, IElasticsearchResponse, new()
 		{
 			cs = null;
@@ -151,7 +152,7 @@ private static bool SetSpecialTypes<TResponse>(RequestData requestData, byte[] b
 				cs = new VoidResponse() as TResponse;
 			else if (responseType == typeof(DynamicResponse))
 			{
-				using (var ms = requestData.MemoryStreamFactory.Create(bytes))
+				using (var ms = memoryStreamFactory.Create(bytes))
 				{
 					var body = LowLevelRequestResponseSerializer.Instance.Deserialize<DynamicBody>(ms);
 					cs = new DynamicResponse(body) as TResponse;
diff --git a/src/Elasticsearch.Net/Transport/PostData.cs b/src/Elasticsearch.Net/Transport/PostData.cs
@@ -119,22 +119,22 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 			switch (Type)
 			{
 				case PostType.ByteArray:
-					ms = new MemoryStream(WrittenBytes);
+					ms = settings.MemoryStreamFactory.Create(WrittenBytes);
 					break;
 				case PostType.LiteralString:
-					ms = !string.IsNullOrEmpty(_literalString) ? new MemoryStream(_literalString?.Utf8Bytes()) : null;
+					ms = !string.IsNullOrEmpty(_literalString) ? settings.MemoryStreamFactory.Create(_literalString?.Utf8Bytes()) : null;
 					break;
 				case PostType.EnumerableOfString:
 					ms = _enumurableOfStrings.HasAny()
-						? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
+						? settings.MemoryStreamFactory.Create((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
 						: null;
 					break;
 				case PostType.EnumerableOfObject:
 					if (!_enumerableOfObject.HasAny()) return;
 
 					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
-						ms = new MemoryStream();
+						ms = settings.MemoryStreamFactory.Create();
 						stream = ms;
 					}
 					else stream = writableStream;
@@ -148,7 +148,7 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 					stream = writableStream;
 					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
-						ms = new MemoryStream();
+						ms = settings.MemoryStreamFactory.Create();
 						stream = ms;
 					}
 					settings.RequestResponseSerializer.Serialize(_serializable, stream, indent);
@@ -171,22 +171,22 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
 			switch (Type)
 			{
 				case PostType.ByteArray:
-					ms = new MemoryStream(WrittenBytes);
+					ms = settings.MemoryStreamFactory.Create(WrittenBytes);
 					break;
 				case PostType.LiteralString:
-					ms = !string.IsNullOrEmpty(_literalString) ? new MemoryStream(_literalString.Utf8Bytes()) : null;
+					ms = !string.IsNullOrEmpty(_literalString) ? settings.MemoryStreamFactory.Create(_literalString.Utf8Bytes()) : null;
 					break;
 				case PostType.EnumerableOfString:
 					ms = _enumurableOfStrings.HasAny()
-						? new MemoryStream((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
+						? settings.MemoryStreamFactory.Create((string.Join(NewLineString, _enumurableOfStrings) + NewLineString).Utf8Bytes())
 						: null;
 					break;
 				case PostType.EnumerableOfObject:
 					if (!_enumerableOfObject.HasAny()) return;
 
 					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
-						ms = new MemoryStream();
+						ms = settings.MemoryStreamFactory.Create();
 						stream = ms;
 					}
 					else stream = writableStream;
@@ -201,7 +201,7 @@ await settings.RequestResponseSerializer.SerializeAsync(o, stream, Serialization
 					stream = writableStream;
 					if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 					{
-						ms = new MemoryStream();
+						ms = settings.MemoryStreamFactory.Create();
 						stream = ms;
 					}
 					await settings.RequestResponseSerializer.SerializeAsync(_serializable, stream, indent, cancellationToken).ConfigureAwait(false);
diff --git a/src/Elasticsearch.Net/Transport/SerializableData.cs b/src/Elasticsearch.Net/Transport/SerializableData.cs
@@ -21,7 +21,7 @@ public override void Write(Stream writableStream, IConnectionConfigurationValues
 			MemoryStream ms = null;
 			if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 			{
-				ms = new MemoryStream();
+				ms = settings.MemoryStreamFactory.Create();
 				stream = ms;
 			}
 			settings.RequestResponseSerializer.Serialize(_serializable, stream, indent);
@@ -43,7 +43,7 @@ public override async Task WriteAsync(Stream writableStream, IConnectionConfigur
 			MemoryStream ms = null;
 			if (DisableDirectStreaming ?? settings.DisableDirectStreaming)
 			{
-				ms = new MemoryStream();
+				ms = settings.MemoryStreamFactory.Create();
 				stream = ms;
 			}
 			await settings.RequestResponseSerializer.SerializeAsync(_serializable, stream, indent, cancellationToken).ConfigureAwait(false);
diff --git a/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs b/src/Nest/Cat/CatHelp/ElasticClient-CatHelp.cs
@@ -58,7 +58,7 @@ public Task<ICatResponse<CatHelpRecord>> CatHelpAsync(ICatHelpRequest request,
 		private CatResponse<CatHelpRecord> DeserializeCatHelpResponse(IApiCallDetails response, Stream stream)
 		{
 			using (stream)
-			using (var ms = new MemoryStream())
+			using (var ms = response.ConnectionConfiguration.MemoryStreamFactory.Create())
 			{
 				stream.CopyTo(ms);
 				var body = ms.ToArray().Utf8String();
diff --git a/src/Nest/Document/Multiple/Bulk/BulkRequestFormatter.cs b/src/Nest/Document/Multiple/Bulk/BulkRequestFormatter.cs
@@ -16,6 +16,7 @@ public void Serialize(ref JsonWriter writer, IBulkRequest value, IJsonFormatterR
 				return;
 
 			var settings = formatterResolver.GetConnectionSettings();
+			var memoryStreamFactory = settings.MemoryStreamFactory;
 			var requestResponseSerializer = settings.RequestResponseSerializer;
 			var sourceSerializer = settings.SourceSerializer;
 			var inferrer = settings.Inferrer;
@@ -44,7 +45,7 @@ public void Serialize(ref JsonWriter writer, IBulkRequest value, IJsonFormatterR
 					? requestResponseSerializer
 					: sourceSerializer;
 
-				var bodyBytes = bodySerializer.SerializeToBytes(body, SerializationFormatting.None);
+				var bodyBytes = bodySerializer.SerializeToBytes(body, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(bodyBytes);
 				writer.WriteRaw(Newline);
 			}
diff --git a/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs b/src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs
@@ -15,6 +15,7 @@ public void Serialize(ref JsonWriter writer, IMultiSearchRequest value, IJsonFor
 				return;
 
 			var settings = formatterResolver.GetConnectionSettings();
+			var memoryStreamFactory = settings.MemoryStreamFactory;
 			var serializer = settings.RequestResponseSerializer;
 
 			foreach (var operation in value.Operations.Values)
@@ -43,10 +44,10 @@ string GetString(string key)
 					ignore_unavailable = GetString("ignore_unavailable")
 				};
 
-				var headerBytes = serializer.SerializeToBytes(header, SerializationFormatting.None);
+				var headerBytes = serializer.SerializeToBytes(header, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(headerBytes);
 				writer.WriteRaw(Newline);
-				var bodyBytes = serializer.SerializeToBytes(operation, SerializationFormatting.None);
+				var bodyBytes = serializer.SerializeToBytes(operation, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(bodyBytes);
 				writer.WriteRaw(Newline);
 			}
diff --git a/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs b/src/Nest/Search/MultiSearchTemplate/MultiSearchTemplateJsonConverter.cs
@@ -14,6 +14,7 @@ public void Serialize(ref JsonWriter writer, IMultiSearchTemplateRequest value,
 			if (value?.Operations == null) return;
 
 			var settings = formatterResolver.GetConnectionSettings();
+			var memoryStreamFactory = settings.MemoryStreamFactory;
 			var serializer = settings.RequestResponseSerializer;
 
 			foreach (var operation in value.Operations.Values)
@@ -42,10 +43,10 @@ string GetString(string key)
 					ignore_unavailable = GetString("ignore_unavailable")
 				};
 
-				var headerBytes = serializer.SerializeToBytes(header, SerializationFormatting.None);
+				var headerBytes = serializer.SerializeToBytes(header, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(headerBytes);
 				writer.WriteRaw(Newline);
-				var bodyBytes = serializer.SerializeToBytes(operation, SerializationFormatting.None);
+				var bodyBytes = serializer.SerializeToBytes(operation, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(bodyBytes);
 				writer.WriteRaw(Newline);
 			}
diff --git a/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs b/src/Nest/XPack/MachineLearning/PostJobData/PostJobDataRequest.cs
@@ -62,10 +62,11 @@ public void Serialize(ref JsonWriter writer, IPostJobDataRequest value, IJsonFor
 
 			var settings = formatterResolver.GetConnectionSettings();
 			var sourceSerializer = settings.SourceSerializer;
+			var memoryStreamFactory = settings.MemoryStreamFactory;
 
 			foreach (var data in value.Data)
 			{
-				var bodyJson = sourceSerializer.SerializeToBytes(data, SerializationFormatting.None);
+				var bodyJson = sourceSerializer.SerializeToBytes(data, memoryStreamFactory, SerializationFormatting.None);
 				writer.WriteRaw(bodyJson);
 				writer.WriteRaw(Newline);
 			}
diff --git a/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs b/src/Serializers/Nest.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs
@@ -30,7 +30,7 @@ IEnumerable<JsonConverter> contractJsonConverters
 			BuiltinSerializer = builtinSerializer;
 			Converters = new List<JsonConverter>
 			{
-				new HandleNestTypesOnSourceJsonConverter(BuiltinSerializer),
+				new HandleNestTypesOnSourceJsonConverter(BuiltinSerializer, connectionSettings.MemoryStreamFactory),
 				new TimeSpanToStringConverter()
 			};
 			_serializer = CreateSerializer(SerializationFormatting.Indented);
diff --git a/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs b/src/Serializers/Nest.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs
diff --git a/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs b/src/Serializers/Nest.JsonNetSerializer/JTokenExtensions.cs
diff --git a/src/Tests/Tests.Core/Client/FixedResponseClient.cs b/src/Tests/Tests.Core/Client/FixedResponseClient.cs
diff --git a/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs b/src/Tests/Tests.Core/Serialization/RoundtripperDsl.cs
diff --git a/src/Tests/Tests.Reproduce/DateSerialization.cs b/src/Tests/Tests.Reproduce/DateSerialization.cs
diff --git a/src/Tests/Tests/Framework/SerializationTests/CompositeKeySerializationTests.cs b/src/Tests/Tests/Framework/SerializationTests/CompositeKeySerializationTests.cs
diff --git a/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs b/src/Tests/Tests/Search/MultiSearch/MultiSearchLowLevelPostDataTests.cs

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public class RecyclableMemoryStreamFactory : IMemoryStreamFactory`
`9`	`9`	`{`
`10`	`10`	`private readonly RecyclableMemoryStreamManager _manager;`
`11`	`11`
	`12`	`+ public static RecyclableMemoryStreamFactory Default { get; } = new RecyclableMemoryStreamFactory();`
	`13`	`+`
`12`	`14`	`public RecyclableMemoryStreamFactory() =>`
`13`	`15`	`_manager = new RecyclableMemoryStreamManager { AggressiveBufferReturn = true };`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public string DebugInformation`
`36`	`36`
`37`	`37`	`public Uri Uri { get; set; }`
`38`	`38`
	`39`	`+ public IConnectionConfigurationValues ConnectionConfiguration { get; set; }`
	`40`	`+`
`39`	`41`	`public override string ToString() =>`
`40`	`42`	`$"{(Success ? "S" : "Uns")}uccessful low level call on {HttpMethod.GetStringValue()}: {Uri.PathAndQuery}";`
`41`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public bool TryGetServerError(out ServerError serverError)`
`15`	`15`	`if (Body == null \|\| Body.Length == 0 \|\| ResponseMimeType != RequestData.MimeType)`
`16`	`16`	`return false;`
`17`	`17`
`18`		`- using(var stream = new MemoryStream(Body))`
	`18`	`+ using(var stream = ConnectionConfiguration.MemoryStreamFactory.Create(Body))`
`19`	`19`	`return ServerError.TryCreate(stream, out serverError);`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public bool TryGetServerError(out ServerError serverError)`
`16`	`16`	`if (string.IsNullOrEmpty(Body) \|\| ResponseMimeType != RequestData.MimeType)`
`17`	`17`	`return false;`
`18`	`18`
`19`		`- using(var stream = new MemoryStream(Encoding.UTF8.GetBytes(Body)))`
	`19`	`+ using(var stream = ConnectionConfiguration.MemoryStreamFactory.Create(Encoding.UTF8.GetBytes(Body)))`
`20`	`20`	`return ServerError.TryCreate(stream, out serverError);`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -11,33 +11,40 @@ public interface IElasticsearchSerializer`
`11`	`11`
`12`	`12`	`T Deserialize<T>(Stream stream);`
`13`	`13`
`14`		`- Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default(CancellationToken));`
	`14`	`+ Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default);`
`15`	`15`
`16`		`- Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken));`
	`16`	`+ Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default);`
`17`	`17`
`18`	`18`	`void Serialize<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented);`
`19`	`19`
`20`	`20`	`Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented,`
`21`		`- CancellationToken cancellationToken = default(CancellationToken)`
	`21`	`+ CancellationToken cancellationToken = default`
`22`	`22`	`);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public static class ElasticsearchSerializerExtensions`
`26`	`26`	`{`
`27`		`- public static byte[] SerializeToBytes<T>(this IElasticsearchSerializer serializer, T data,`
	`27`	`+ public static byte[] SerializeToBytes<T>(`
	`28`	`+ this IElasticsearchSerializer serializer,`
	`29`	`+ T data,`
	`30`	`+ IMemoryStreamFactory memoryStreamFactory = null,`
`28`	`31`	`SerializationFormatting formatting = SerializationFormatting.Indented`
`29`	`32`	`)`
`30`	`33`	`{`
`31`		`- using (var ms = new MemoryStream())`
	`34`	`+ memoryStreamFactory = memoryStreamFactory ?? RecyclableMemoryStreamFactory.Default;`
	`35`	`+ using (var ms = memoryStreamFactory.Create())`
`32`	`36`	`{`
`33`	`37`	`serializer.Serialize(data, ms, formatting);`
`34`	`38`	`return ms.ToArray();`
`35`	`39`	`}`
`36`	`40`	`}`
`37`	`41`
`38`		`- public static string SerializeToString<T>(this IElasticsearchSerializer serializer, T data,`
	`42`	`+ public static string SerializeToString<T>(`
	`43`	`+ this IElasticsearchSerializer serializer,`
	`44`	`+ T data,`
	`45`	`+ IMemoryStreamFactory memoryStreamFactory = null,`
`39`	`46`	`SerializationFormatting formatting = SerializationFormatting.Indented`
`40`	`47`	`) =>`
`41`		`- serializer.SerializeToBytes(data, formatting).Utf8String();`
	`48`	`+ serializer.SerializeToBytes(data, memoryStreamFactory, formatting).Utf8String();`
`42`	`49`	`}`
`43`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ ElasticsearchClientException exception`
`135`	`135`	`if (response == null)`
`136`	`136`	`{`
`137`	`137`	`//make sure we copy over the error body in case we disabled direct streaming.`
`138`		`- var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : new MemoryStream(callDetails.ResponseBodyInBytes);`
	`138`	`+ var s = callDetails?.ResponseBodyInBytes == null ? Stream.Null : _memoryStreamFactory.Create(callDetails.ResponseBodyInBytes);`
`139`	`139`	`var m = callDetails?.ResponseMimeType ?? RequestData.MimeType;`
`140`	`140`	`response = ResponseBuilder.ToResponse<TResponse>(data, exception, callDetails?.HttpStatusCode, null, s, m);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ private static ApiCallDetails Initialize(`
`70`	`70`	`Uri = requestData.Uri,`
`71`	`71`	`HttpMethod = requestData.Method,`
`72`	`72`	`DeprecationWarnings = warnings ?? Enumerable.Empty<string>(),`
`73`		`- ResponseMimeType = mimeType`
	`73`	`+ ResponseMimeType = mimeType,`
	`74`	`+ ConnectionConfiguration = requestData.ConnectionSettings`
`74`	`75`	`};`
`75`	`76`	`return details;`
`76`	`77`	`}`
`@@ -90,7 +91,7 @@ private static TResponse SetBody<TResponse>(ApiCallDetails details, RequestData`
`90`	`91`
`91`	`92`	`using (responseStream)`
`92`	`93`	`{`
`93`		`- if (SetSpecialTypes<TResponse>(requestData, bytes, out var r))`
	`94`	`+ if (SetSpecialTypes<TResponse>(bytes, requestData.MemoryStreamFactory, out var r))`
`94`	`95`	`return r;`
`95`	`96`
`96`	`97`	`if (details.HttpStatusCode.HasValue && requestData.SkipDeserializationForStatusCodes.Contains(details.HttpStatusCode.Value))`
`@@ -121,7 +122,7 @@ private static async Task<TResponse> SetBodyAsync<TResponse>(`
`121`	`122`
`122`	`123`	`using (responseStream)`
`123`	`124`	`{`
`124`		`- if (SetSpecialTypes<TResponse>(requestData, bytes, out var r)) return r;`
	`125`	`+ if (SetSpecialTypes<TResponse>(bytes, requestData.MemoryStreamFactory, out var r)) return r;`
`125`	`126`
`126`	`127`	`if (details.HttpStatusCode.HasValue && requestData.SkipDeserializationForStatusCodes.Contains(details.HttpStatusCode.Value))`
`127`	`128`	`return null;`
`@@ -136,7 +137,7 @@ private static async Task<TResponse> SetBodyAsync<TResponse>(`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`
`139`		`- private static bool SetSpecialTypes<TResponse>(RequestData requestData, byte[] bytes, out TResponse cs)`
	`140`	`+ private static bool SetSpecialTypes<TResponse>(byte[] bytes, IMemoryStreamFactory memoryStreamFactory, out TResponse cs)`
`140`	`141`	`where TResponse : class, IElasticsearchResponse, new()`
`141`	`142`	`{`
`142`	`143`	`cs = null;`
`@@ -151,7 +152,7 @@ private static bool SetSpecialTypes<TResponse>(RequestData requestData, byte[] b`
`151`	`152`	`cs = new VoidResponse() as TResponse;`
`152`	`153`	`else if (responseType == typeof(DynamicResponse))`
`153`	`154`	`{`
`154`		`- using (var ms = requestData.MemoryStreamFactory.Create(bytes))`
	`155`	`+ using (var ms = memoryStreamFactory.Create(bytes))`
`155`	`156`	`{`
`156`	`157`	`var body = LowLevelRequestResponseSerializer.Instance.Deserialize<DynamicBody>(ms);`
`157`	`158`	`cs = new DynamicResponse(body) as TResponse;`