Changes per PR

Author: pranavkm

src/Mvc/Mvc.Core/src/DependencyInjection/MvcCoreServiceCollectionExtensions.cs

@@ -260,7 +260,6 @@ internal static void AddMvcCoreServices(IServiceCollection services)
             services.TryAddSingleton<IActionResultExecutor<ContentResult>, ContentResultExecutor>();
             services.TryAddSingleton<IActionResultExecutor<JsonResult>, SystemTextJsonResultExecutor>();
             services.TryAddSingleton<IClientErrorFactory, ProblemDetailsClientErrorFactory>();
-            services.TryAddSingleton<AsyncEnumerableReader>();
 
             //
             // Route Handlers

src/Mvc/Mvc.Core/src/Infrastructure/AsyncEnumerableReader.cs

@@ -10,9 +10,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Core;
 using Microsoft.Extensions.Internal;
-using Microsoft.Extensions.Options;
 
+#if JSONNET
+namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson
+#else
 namespace Microsoft.AspNetCore.Mvc.Infrastructure
+#endif
 {
     using ReaderFunc = Func<IAsyncEnumerable<object>, Task<ICollection>>;
 
@@ -22,10 +25,10 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
     /// </summary>
     /// <remarks>
     /// This type is used to create a strongly typed synchronous <see cref="ICollection{T}"/> instance from
-    /// an <see cref="IAsyncEnumerable{T}"/>. An accurate <see cref="ICollection{T}"/> is required for XML formatters to 
+    /// an <see cref="IAsyncEnumerable{T}"/>. An accurate <see cref="ICollection{T}"/> is required for XML formatters to
     /// correctly serialize.
     /// </remarks>
-    public sealed class AsyncEnumerableReader
+    internal sealed class AsyncEnumerableReader
     {
         private readonly MethodInfo Converter = typeof(AsyncEnumerableReader).GetMethod(
             nameof(ReadInternal),
@@ -39,9 +42,9 @@ public sealed class AsyncEnumerableReader
         /// Initializes a new instance of <see cref="AsyncEnumerableReader"/>.
         /// </summary>
         /// <param name="mvcOptions">Accessor to <see cref="MvcOptions"/>.</param>
-        public AsyncEnumerableReader(IOptions<MvcOptions> mvcOptions)
+        public AsyncEnumerableReader(MvcOptions mvcOptions)
         {
-            _mvcOptions = mvcOptions?.Value ?? throw new ArgumentNullException(nameof(mvcOptions));
+            _mvcOptions = mvcOptions;
         }
 
         /// <summary>

src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs

@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Mvc.Infrastructure
 {
@@ -31,7 +32,7 @@ public ObjectResultExecutor(
             OutputFormatterSelector formatterSelector,
             IHttpResponseStreamWriterFactory writerFactory,
             ILoggerFactory loggerFactory)
-            : this(formatterSelector, writerFactory, loggerFactory, asyncEnumerableReader: null)
+            : this(formatterSelector, writerFactory, loggerFactory, mvcOptions: null)
         {
         }
 
@@ -41,12 +42,12 @@ public ObjectResultExecutor(
         /// <param name="formatterSelector">The <see cref="OutputFormatterSelector"/>.</param>
         /// <param name="writerFactory">The <see cref="IHttpResponseStreamWriterFactory"/>.</param>
         /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
-        /// <param name="asyncEnumerableReader">The <see cref="AsyncEnumerableReader"/>.</param>
+        /// <param name="mvcOptions">Accessor to <see cref="MvcOptions"/>.</param>
         public ObjectResultExecutor(
             OutputFormatterSelector formatterSelector,
             IHttpResponseStreamWriterFactory writerFactory,
             ILoggerFactory loggerFactory,
-            AsyncEnumerableReader asyncEnumerableReader)
+            IOptions<MvcOptions> mvcOptions)
         {
             if (formatterSelector == null)
             {
@@ -66,7 +67,8 @@ public ObjectResultExecutor(
             FormatterSelector = formatterSelector;
             WriterFactory = writerFactory.CreateWriter;
             Logger = loggerFactory.CreateLogger<ObjectResultExecutor>();
-            _asyncEnumerableReader = asyncEnumerableReader ?? throw new ArgumentNullException(nameof(asyncEnumerableReader));
+            var options = mvcOptions?.Value ?? throw new ArgumentNullException(nameof(mvcOptions));
+            _asyncEnumerableReader = new AsyncEnumerableReader(options);
         }
 
         /// <summary>
@@ -125,6 +127,8 @@ public virtual Task ExecuteAsync(ActionContext context, ObjectResult result)
 
         private async Task ExecuteAsyncEnumerable(ActionContext context, ObjectResult result, IAsyncEnumerable<object> asyncEnumerable)
         {
+            Log.BufferingAsyncEnumerable(Logger, asyncEnumerable);
+
             var enumerated = await _asyncEnumerableReader.ReadAsync(asyncEnumerable);
             await ExecuteAsyncCore(context, result, enumerated.GetType(), enumerated);
         }
@@ -178,6 +182,20 @@ private static void InferContentTypes(ActionContext context, ObjectResult result
             }
         }
 
-        
+        private static class Log
+        {
+            private static readonly Action<ILogger, string, Exception> _bufferingAsyncEnumerable;
+
+            static Log()
+            {
+                _bufferingAsyncEnumerable = LoggerMessage.Define<string>(
+                   LogLevel.Debug,
+                   new EventId(1, "BufferingAsyncEnumerable"),
+                   "Buffering IAsyncEnumerable instance of type '{Type}'.");
+            }
+
+            public static void BufferingAsyncEnumerable(ILogger logger, IAsyncEnumerable<object> asyncEnumerable)
+                => _bufferingAsyncEnumerable(logger, asyncEnumerable.GetType().FullName, null);
+        }
     }
 }

src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs

@@ -26,16 +26,16 @@ internal sealed class SystemTextJsonResultExecutor : IActionResultExecutor<JsonR
 
         private readonly JsonOptions _options;
         private readonly ILogger<SystemTextJsonResultExecutor> _logger;
-        private readonly AsyncEnumerableReader _reader;
+        private readonly AsyncEnumerableReader _asyncEnumerableReader;
 
         public SystemTextJsonResultExecutor(
             IOptions<JsonOptions> options,
             ILogger<SystemTextJsonResultExecutor> logger,
-            AsyncEnumerableReader reader)
+            IOptions<MvcOptions> mvcOptions)
         {
             _options = options.Value;
             _logger = logger;
-            _reader = reader;
+            _asyncEnumerableReader = new AsyncEnumerableReader(mvcOptions.Value);
         }
 
         public async Task ExecuteAsync(ActionContext context, JsonResult result)
@@ -77,8 +77,8 @@ public async Task ExecuteAsync(ActionContext context, JsonResult result)
                 var value = result.Value;
                 if (value is IAsyncEnumerable<object> asyncEnumerable)
                 {
-                    Log.EagerlyReadingAsyncEnumerable(_logger, asyncEnumerable);
-                    value = await _reader.ReadAsync(asyncEnumerable);
+                    Log.BufferingAsyncEnumerable(_logger, asyncEnumerable);
+                    value = await _asyncEnumerableReader.ReadAsync(asyncEnumerable);
                 }
 
                 var type = value?.GetType() ?? typeof(object);
@@ -134,22 +134,19 @@ private static class Log
                 new EventId(1, "JsonResultExecuting"),
                 "Executing JsonResult, writing value of type '{Type}'.");
 
-            private static readonly Action<ILogger, string, Exception> _eagerlyReadingAsyncEnumerable = LoggerMessage.Define<string>(
+            private static readonly Action<ILogger, string, Exception> _bufferingAsyncEnumerable = LoggerMessage.Define<string>(
                LogLevel.Debug,
-               new EventId(2, "EagerReadAsyncEnumerable"),
-               "Eagerly reading IAsyncEnumerable instance of type '{Type}'.");
+               new EventId(2, "BufferingAsyncEnumerable"),
+               "Buffering IAsyncEnumerable instance of type '{Type}'.");
 
             public static void JsonResultExecuting(ILogger logger, object value)
             {
                 var type = value == null ? "null" : value.GetType().FullName;
                 _jsonResultExecuting(logger, type, null);
             }
 
-            public static void EagerlyReadingAsyncEnumerable(ILogger logger, object value)
-            {
-                var type = value == null ? "null" : value.GetType().FullName;
-                _eagerlyReadingAsyncEnumerable(logger, type, null);
-            }
+            public static void BufferingAsyncEnumerable(ILogger logger, IAsyncEnumerable<object> asyncEnumerable)
+                => _bufferingAsyncEnumerable(logger, asyncEnumerable.GetType().FullName, null);
         }
     }
 }

src/Mvc/Mvc.Core/src/Properties/Resources.Designer.cs

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -505,6 +505,6 @@
     <value>Property '{0}.{1}' must be an instance of type '{2}'.</value>
   </data>
   <data name="ObjectResultExecutor_MaxEnumerationExceeded" xml:space="preserve">
-    <value>'{0}' reached the configured maximum size of the buffer when an enumerating a value of type `{1}'. This limit is in place to prevent infinite streams of `IAsyncEnumerable&lt;&gt;` from continuing indefinitely. If this is not a programming mistake, consider ways to reduce the collection or size, or consider manually converting '{1}' into a list rather than increasing the limit.</value>
+    <value>'{0}' reached the configured maximum size of the buffer when enumerating a value of type '{1}'. This limit is in place to prevent infinite streams of 'IAsyncEnumerable&lt;&gt;' from continuing indefinitely. If this is not a programming mistake, consider ways to reduce the collection size, or consider manually converting '{1}' into a list rather than increasing the limit.</value>
   </data>
-</root>
+</root>

src/Mvc/Mvc.Core/src/Resources.resx

@@ -276,7 +276,7 @@ private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/AcceptedAtActionResultTests.cs

@@ -184,7 +184,7 @@ private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(Options.Create(new MvcOptions()))));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/AcceptedAtRouteResultTests.cs

@@ -140,7 +140,7 @@ private static IServiceProvider CreateServices(Mock<IOutputFormatter> formatter)
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/AcceptedResultTests.cs

@@ -98,7 +98,7 @@ private static IServiceProvider CreateServices()
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/CreatedAtActionResultTests.cs

@@ -111,7 +111,7 @@ private static IServiceProvider CreateServices()
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/CreatedAtRouteResultTests.cs

@@ -99,7 +99,7 @@ private static IServiceProvider CreateServices()
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/CreatedResultTests.cs

@@ -76,7 +76,7 @@ private static IServiceProvider CreateServices()
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }

src/Mvc/Mvc.Core/test/HttpNotFoundObjectResultTest.cs

@@ -77,7 +77,7 @@ private static IServiceProvider CreateServices()
                 new DefaultOutputFormatterSelector(options, NullLoggerFactory.Instance),
                 new TestHttpResponseStreamWriterFactory(),
                 NullLoggerFactory.Instance,
-                new AsyncEnumerableReader(options)));
+                options));
 
             return services.BuildServiceProvider();
         }