From 8b861ea7d717eb09673d4ca648dc96ebe36fe425 Mon Sep 17 00:00:00 2001
From: Brian Friesen <brian.friesen@gmail.com>
Date: Fri, 23 Aug 2019 18:32:25 -0400
Subject: [PATCH] Add CreateXmlReader overload - adds Type parameter (#13302)

* Add CreateXmlReader overload - adds Type parameter

This change allows inheritors of XmlSerializerInputFormatter to return a different XmlReader depending on the type being serialized. For example, an inheritor could return XSD-validating readers that validate against one schema or another (or perhaps not validate at all), depending on the value of the type parameter.
---
 ...spNetCore.Mvc.Formatters.Xml.netcoreapp3.0.cs |  1 +
 .../src/XmlSerializerInputFormatter.cs           | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.netcoreapp3.0.cs b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.netcoreapp3.0.cs
index fa9ffb071d..eae4a1a733 100644
--- a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.netcoreapp3.0.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.netcoreapp3.0.cs
@@ -47,6 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         protected override bool CanReadType(System.Type type) { throw null; }
         protected virtual System.Xml.Serialization.XmlSerializer CreateSerializer(System.Type type) { throw null; }
         protected virtual System.Xml.XmlReader CreateXmlReader(System.IO.Stream readStream, System.Text.Encoding encoding) { throw null; }
+        protected virtual System.Xml.XmlReader CreateXmlReader(System.IO.Stream readStream, System.Text.Encoding encoding, System.Type type) { throw null; }
         protected virtual System.Xml.Serialization.XmlSerializer GetCachedSerializer(System.Type type) { throw null; }
         protected virtual System.Type GetSerializableType(System.Type declaredType) { throw null; }
         [System.Diagnostics.DebuggerStepThroughAttribute]
diff --git a/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs b/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs
index 4debb6fe69..da40141ded 100644
--- a/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/src/XmlSerializerInputFormatter.cs
@@ -119,8 +119,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
 
             try
             {
-                using var xmlReader = CreateXmlReader(readStream, encoding);
-                var type = GetSerializableType(context.ModelType);
+                var type = GetSerializableType(context.ModelType);                
+                using var xmlReader = CreateXmlReader(readStream, encoding, type);
 
                 var serializer = GetCachedSerializer(type);
 
@@ -191,6 +191,18 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
             return wrapperProvider?.WrappingType ?? declaredType;
         }
 
+        /// <summary>
+        /// Called during deserialization to get the <see cref="XmlReader"/>.
+        /// </summary>
+        /// <param name="readStream">The <see cref="Stream"/> from which to read.</param>
+        /// <param name="encoding">The <see cref="Encoding"/> used to read the stream.</param>
+        /// <param name="type">The <see cref="Type"/> that is to be deserialized.</param>
+        /// <returns>The <see cref="XmlReader"/> used during deserialization.</returns>
+        protected virtual XmlReader CreateXmlReader(Stream readStream, Encoding encoding, Type type)
+        {
+            return CreateXmlReader(readStream, encoding);
+        }
+
         /// <summary>
         /// Called during deserialization to get the <see cref="XmlReader"/>.
         /// </summary>