huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fixes #4092] Using System.Buffers in JsonResultExecutor

This commit is contained in:
Ajay Bhargav Baaskaran 2016-02-19 16:45:26 -08:00
parent b39f4dfe29
commit df5eb0a15c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Buffers;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Internal;
@ -22,6 +23,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
Encoding = Encoding.UTF8
}.ToString();
private readonly IArrayPool<char> _charPool;
/// <summary>
/// Creates a new <see cref="JsonResultExecutor"/>.
/// </summary>
@ -31,7 +34,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
public JsonResultExecutor(
IHttpResponseStreamWriterFactory writerFactory,
ILogger<JsonResultExecutor> logger,
IOptions<MvcJsonOptions> options)
IOptions<MvcJsonOptions> options,
ArrayPool<char> charPool)
{
if (writerFactory == null)
{
@ -48,9 +52,15 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
throw new ArgumentNullException(nameof(options));
}
if (charPool == null)
{
throw new ArgumentNullException(nameof(charPool));
}
WriterFactory = writerFactory;
Logger = logger;
Options = options.Value;
_charPool = new JsonArrayPool<char>(charPool);
}
/// <summary>
@ -111,6 +121,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
{
using (var jsonWriter = new JsonTextWriter(writer))
{
jsonWriter.ArrayPool = _charPool;
jsonWriter.CloseOutput = false;
var jsonSerializer = JsonSerializer.Create(serializerSettings);

4
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Buffers;
using System.IO;
using System.Text;
using System.Threading.Tasks;
@ -161,7 +162,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
return new JsonResultExecutor(
new TestHttpResponseStreamWriterFactory(),
NullLogger<JsonResultExecutor>.Instance,
new TestOptionsManager<MvcJsonOptions>());
new TestOptionsManager<MvcJsonOptions>(),
ArrayPool<char>.Shared);
}
private static HttpContext GetHttpContext()

4
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Buffers;
using System.IO;
using System.Text;
using System.Threading.Tasks;
@ -46,7 +47,8 @@ namespace Microsoft.AspNetCore.Mvc
var executor = new JsonResultExecutor(
new TestHttpResponseStreamWriterFactory(),
NullLogger<JsonResultExecutor>.Instance,
new TestOptionsManager<MvcJsonOptions>());
new TestOptionsManager<MvcJsonOptions>(),
ArrayPool<char>.Shared);
var services = new ServiceCollection();
services.AddSingleton(executor);