Splitting ModelBinding Context into operation specific and model spec…

…ific context.

src/Microsoft.AspNet.Mvc.Core/ControllerActionArgumentBinder.cs

@@ -89,21 +89,25 @@ internal static ModelBindingContext GetModelBindingContext(ModelMetadata modelMe
                 propertyName => BindAttribute.IsPropertyAllowed(propertyName,
                                                                 modelMetadata.IncludedProperties,
                                                                 modelMetadata.ExcludedProperties);
+            var operationBindingContext = new OperationBindingContext
+            {
+                ModelBinder = actionBindingContext.ModelBinder,
+                ValidatorProvider = actionBindingContext.ValidatorProvider,
+                MetadataProvider = actionBindingContext.MetadataProvider,
+                HttpContext = actionBindingContext.ActionContext.HttpContext,
+                OriginalValueProvider = actionBindingContext.ValueProvider,
+            };
 
             var modelBindingContext = new ModelBindingContext
             {
                 ModelName = modelMetadata.ModelName ?? modelMetadata.PropertyName,
                 ModelMetadata = modelMetadata,
                 ModelState = actionBindingContext.ActionContext.ModelState,
-                ModelBinder = actionBindingContext.ModelBinder,
-                ValidatorProvider = actionBindingContext.ValidatorProvider,
-                MetadataProvider = actionBindingContext.MetadataProvider,
-                HttpContext = actionBindingContext.ActionContext.HttpContext,
                 PropertyFilter = propertyFilter,
                 // Fallback only if there is no explicit model name set.
                 FallbackToEmptyPrefix = modelMetadata.ModelName == null,
                 ValueProvider = actionBindingContext.ValueProvider,
-                OriginalValueProvider = actionBindingContext.ValueProvider,
+                OperationBindingContext = operationBindingContext,
             };
 
             return modelBindingContext;

src/Microsoft.AspNet.Mvc.Core/ModelBinders/BodyModelBinder.cs

@@ -40,7 +40,7 @@ protected override async Task<bool> BindAsync(
             if (formatter == null)
             {
                 var unsupportedContentType = Resources.FormatUnsupportedContentType(
-                                                    bindingContext.HttpContext.Request.ContentType);
+                                                    bindingContext.OperationBindingContext.HttpContext.Request.ContentType);
                 bindingContext.ModelState.AddModelError(bindingContext.ModelName, unsupportedContentType);
 
                 // Should always return true so that the model binding process ends here.
@@ -51,8 +51,8 @@ protected override async Task<bool> BindAsync(
 
             // Validate the deserialized object
             var validationContext = new ModelValidationContext(
-                bindingContext.MetadataProvider,
-                bindingContext.ValidatorProvider,
+                bindingContext.OperationBindingContext.MetadataProvider,
+                bindingContext.OperationBindingContext.ValidatorProvider,
                 bindingContext.ModelState,
                 bindingContext.ModelMetadata,
                 containerMetadata: null,

src/Microsoft.AspNet.Mvc.Core/ParameterBinding/ModelBindingHelper.cs

@@ -40,19 +40,23 @@ public static async Task<bool> TryUpdateModelAsync<TModel>(
             var modelMetadata = metadataProvider.GetMetadataForType(
                 modelAccessor: null,
                 modelType: typeof(TModel));
+            var operationBindingContext = new OperationBindingContext
+            {
+                ModelBinder = modelBinder,
+                ValidatorProvider = validatorProvider,
+                MetadataProvider = metadataProvider,
+                HttpContext = httpContext
+            };
 
             var modelBindingContext = new ModelBindingContext
             {
                 ModelMetadata = modelMetadata,
                 ModelName = prefix,
                 Model = model,
                 ModelState = modelState,
-                ModelBinder = modelBinder,
                 ValueProvider = valueProvider,
-                ValidatorProvider = validatorProvider,
-                MetadataProvider = metadataProvider,
                 FallbackToEmptyPrefix = true,
-                HttpContext = httpContext
+                OperationBindingContext = operationBindingContext,
             };
 
             if (await modelBinder.BindModelAsync(modelBindingContext))

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/CancellationTokenModelBinder.cs

@@ -16,7 +16,7 @@ public Task<bool> BindModelAsync(ModelBindingContext bindingContext)
         {
             if (bindingContext.ModelType == typeof(CancellationToken))
             {
-                bindingContext.Model = bindingContext.HttpContext.RequestAborted;
+                bindingContext.Model =bindingContext.OperationBindingContext.HttpContext.RequestAborted;
                 return Task.FromResult(true);
             }
 

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/CollectionModelBinder.cs

@@ -49,7 +49,7 @@ internal async Task<List<TElement>> BindSimpleCollection(ModelBindingContext bin
             {
                 var innerBindingContext = new ModelBindingContext(bindingContext)
                 {
-                    ModelMetadata = bindingContext.MetadataProvider.GetMetadataForType(null, typeof(TElement)),
+                    ModelMetadata = bindingContext.OperationBindingContext.MetadataProvider.GetMetadataForType(null, typeof(TElement)),
                     ModelName = bindingContext.ModelName,
                     ValueProvider = new CompositeValueProvider
                     {
@@ -60,7 +60,7 @@ internal async Task<List<TElement>> BindSimpleCollection(ModelBindingContext bin
                 };
 
                 object boundValue = null;
-                if (await bindingContext.ModelBinder.BindModelAsync(innerBindingContext))
+                if (await bindingContext.OperationBindingContext.ModelBinder.BindModelAsync(innerBindingContext))
                 {
                     boundValue = innerBindingContext.Model;
                     bindingContext.ValidationNode.ChildNodes.Add(innerBindingContext.ValidationNode);
@@ -101,7 +101,7 @@ internal async Task<List<TElement>> BindComplexCollectionFromIndexes(ModelBindin
                 var fullChildName = ModelBindingHelper.CreateIndexModelName(bindingContext.ModelName, indexName);
                 var childBindingContext = new ModelBindingContext(bindingContext)
                 {
-                    ModelMetadata = bindingContext.MetadataProvider.GetMetadataForType(null, typeof(TElement)),
+                    ModelMetadata = bindingContext.OperationBindingContext.MetadataProvider.GetMetadataForType(null, typeof(TElement)),
                     ModelName = fullChildName
                 };
 
@@ -110,7 +110,7 @@ internal async Task<List<TElement>> BindComplexCollectionFromIndexes(ModelBindin
 
                 var modelType = bindingContext.ModelType;
 
-                if (await bindingContext.ModelBinder.BindModelAsync(childBindingContext))
+                if (await bindingContext.OperationBindingContext.ModelBinder.BindModelAsync(childBindingContext))
                 {
                     didBind = true;
                     boundValue = childBindingContext.Model;

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/ComplexModelDtoModelBinder.cs

@@ -28,7 +28,7 @@ public async Task<bool> BindModelAsync(ModelBindingContext bindingContext)
 
                     // bind and propagate the values
                     // If we can't bind, then leave the result missing (don't add a null).
-                    if (await bindingContext.ModelBinder.BindModelAsync(propertyBindingContext))
+                    if (await bindingContext.OperationBindingContext.ModelBinder.BindModelAsync(propertyBindingContext))
                     {
                         var result = new ComplexModelDtoResult(propertyBindingContext.Model,
                                                                propertyBindingContext.ValidationNode);

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/CompositeModelBinder.cs

@@ -80,8 +80,8 @@ public virtual async Task<bool> BindModelAsync([NotNull] ModelBindingContext bin
                                                                                bindingContext.ModelName);
                 }
 
-                var validationContext = new ModelValidationContext(bindingContext.MetadataProvider,
-                                                                   bindingContext.ValidatorProvider,
+                var validationContext = new ModelValidationContext( bindingContext.OperationBindingContext.MetadataProvider,
+                                                                   bindingContext.OperationBindingContext.ValidatorProvider,
                                                                    bindingContext.ModelState,
                                                                    bindingContext.ModelMetadata,
                                                                    containerMetadata: null);
@@ -131,11 +131,7 @@ private static ModelBindingContext CreateNewBindingContext(ModelBindingContext o
                 ModelName = modelName,
                 ModelState = oldBindingContext.ModelState,
                 ValueProvider = oldBindingContext.ValueProvider,
-                OriginalValueProvider = oldBindingContext.OriginalValueProvider,
-                ValidatorProvider = oldBindingContext.ValidatorProvider,
-                MetadataProvider = oldBindingContext.MetadataProvider,
-                ModelBinder = oldBindingContext.ModelBinder,
-                HttpContext = oldBindingContext.HttpContext,
+                OperationBindingContext = oldBindingContext.OperationBindingContext,
                 PropertyFilter = oldBindingContext.PropertyFilter,
             };
 
@@ -155,7 +151,7 @@ private static ModelBindingContext CreateNewBindingContext(ModelBindingContext o
                 // of all value providers. This is so that every artifact that is explicitly marked using an
                 // IValueProviderMetadata can restrict model binding to only use value providers which support this 
                 // IValueProviderMetadata.
-                var valueProvider = oldBindingContext.OriginalValueProvider as IMetadataAwareValueProvider;
+                var valueProvider = oldBindingContext.OperationBindingContext.OriginalValueProvider as IMetadataAwareValueProvider;
                 if (valueProvider != null)
                 {
                     newBindingContext.ValueProvider = valueProvider.Filter(metadata);

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/KeyValuePairModelBinder.cs

@@ -30,12 +30,12 @@ internal async Task<BindResult<TModel>> TryBindStrongModel<TModel>(ModelBindingC
         {
             var propertyBindingContext = new ModelBindingContext(parentBindingContext)
             {
-                ModelMetadata = parentBindingContext.MetadataProvider.GetMetadataForType(modelAccessor: null,
+                ModelMetadata = parentBindingContext.OperationBindingContext.MetadataProvider.GetMetadataForType(modelAccessor: null,
                                                                                         modelType: typeof(TModel)),
                 ModelName = ModelBindingHelper.CreatePropertyModelName(parentBindingContext.ModelName, propertyName)
             };
 
-            if (await propertyBindingContext.ModelBinder.BindModelAsync(propertyBindingContext))
+            if (await propertyBindingContext.OperationBindingContext.ModelBinder.BindModelAsync(propertyBindingContext))
             {
                 var untypedModel = propertyBindingContext.Model;
                 var model = ModelBindingHelper.CastOrDefault<TModel>(untypedModel);

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/MutableObjectModelBinder.cs

@@ -139,7 +139,7 @@ private async Task<bool> CanBindValue(ModelBindingContext bindingContext, ModelM
             if (valueProviderMetadata != null)
             {
                 // if there is a binder metadata and since the property can be bound using a value provider.
-                var metadataAwareValueProvider = bindingContext.OriginalValueProvider as IMetadataAwareValueProvider;
+                var metadataAwareValueProvider = bindingContext.OperationBindingContext.OriginalValueProvider as IMetadataAwareValueProvider;
                 if (metadataAwareValueProvider != null)
                 {
                     valueProvider = metadataAwareValueProvider.Filter(valueProviderMetadata);
@@ -212,12 +212,12 @@ private ComplexModelDto CreateAndPopulateDto(ModelBindingContext bindingContext,
             var originalDto = new ComplexModelDto(bindingContext.ModelMetadata, propertyMetadatas);
             var dtoBindingContext = new ModelBindingContext(bindingContext)
             {
-                ModelMetadata = bindingContext.MetadataProvider.GetMetadataForType(() => originalDto,
+                ModelMetadata = bindingContext.OperationBindingContext.MetadataProvider.GetMetadataForType(() => originalDto,
                                                                                    typeof(ComplexModelDto)),
                 ModelName = bindingContext.ModelName
             };
 
-            bindingContext.ModelBinder.BindModelAsync(dtoBindingContext);
+            bindingContext.OperationBindingContext.ModelBinder.BindModelAsync(dtoBindingContext);
             return (ComplexModelDto)dtoBindingContext.Model;
         }
 
@@ -265,8 +265,9 @@ protected virtual void EnsureModel(ModelBindingContext bindingContext)
         protected virtual IEnumerable<ModelMetadata> GetMetadataForProperties(ModelBindingContext bindingContext)
         {
             var validationInfo = GetPropertyValidationInfo(bindingContext);
-            var propertyTypeMetadata = bindingContext.MetadataProvider
-                                                       .GetMetadataForType(null, bindingContext.ModelType);
+            var propertyTypeMetadata = bindingContext.OperationBindingContext
+                                                     .MetadataProvider
+                                                     .GetMetadataForType(null, bindingContext.ModelType);
             Predicate<string> newPropertyFilter =
                 propertyName => bindingContext.PropertyFilter(propertyName) &&
                                 BindAttribute.IsPropertyAllowed(
@@ -298,7 +299,8 @@ internal static PropertyValidationInfo GetPropertyValidationInfo(ModelBindingCon
             {
                 var propertyName = property.Name;
                 var propertyMetadata = bindingContext.PropertyMetadata[propertyName];
-                var requiredValidator = bindingContext.ValidatorProvider
+                var requiredValidator = bindingContext.OperationBindingContext
+                                                      .ValidatorProvider
                                                       .GetValidators(propertyMetadata)
                                                       .FirstOrDefault(v => v != null && v.IsRequired);
                 if (requiredValidator != null)

src/Microsoft.AspNet.Mvc.ModelBinding/ModelBindingContext.cs

@@ -41,14 +41,12 @@ public ModelBindingContext(ModelBindingContext bindingContext)
             {
                 ModelState = bindingContext.ModelState;
                 ValueProvider = bindingContext.ValueProvider;
-                OriginalValueProvider = bindingContext.OriginalValueProvider;
-                MetadataProvider = bindingContext.MetadataProvider;
-                ModelBinder = bindingContext.ModelBinder;
-                ValidatorProvider = bindingContext.ValidatorProvider;
-                HttpContext = bindingContext.HttpContext;
+                OperationBindingContext = bindingContext.OperationBindingContext;
             }
         }
 
+        public OperationBindingContext OperationBindingContext { get; set; }
+
         /// <summary>
         /// Gets or sets the model associated with this context.
         /// </summary>
@@ -130,38 +128,11 @@ public Type ModelType
         /// </summary>
         public bool FallbackToEmptyPrefix { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="HttpContext"/> for the current request.
-        /// </summary>
-        public HttpContext HttpContext { get; set; }
-
-        /// <summary>
-        /// Gets unaltered value provider collection.
-        /// Value providers can be filtered by specific model binders.
-        /// </summary>
-        public IValueProvider OriginalValueProvider { get; set; }
-
         /// <summary>
         /// Gets or sets the <see cref="IValueProvider"/> associated with this context.
         /// </summary>
         public IValueProvider ValueProvider { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="IModelBinder"/> associated with this context.
-        /// </summary>
-        public IModelBinder ModelBinder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IModelMetadataProvider"/> associated with this context.
-        /// </summary>
-        public IModelMetadataProvider MetadataProvider { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IModelValidatorProvider"/> instance used for model validation with this
-        /// context.
-        /// </summary>
-        public IModelValidatorProvider ValidatorProvider { get; set; }
-
         /// <summary>
         /// Gets a dictionary of property name to <see cref="ModelMetadata"/> instances for
         /// <see cref="ModelMetadata.Properties"/>

src/Microsoft.AspNet.Mvc.ModelBinding/OperationBindingContext.cs

@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNet.Http;
+
+namespace Microsoft.AspNet.Mvc.ModelBinding
+{
+    /// <summary>
+    /// A context that contains operating information for model binding and validation.
+    /// </summary>
+    public class OperationBindingContext
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OperationBindingContext"/> class.
+        /// </summary>
+        public OperationBindingContext()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OperationBindingContext"/> class using the
+        /// <param name="bindingContext" />.
+        // </summary>
+        /// <remarks>
+        /// This constructor copies certain values that won't change between parent and child objects,
+        /// e.g. ValueProvider, ModelState
+        /// </remarks>
+        public OperationBindingContext(OperationBindingContext bindingContext)
+        {
+            if (bindingContext != null)
+            {
+                OriginalValueProvider = bindingContext.OriginalValueProvider;
+                MetadataProvider = bindingContext.MetadataProvider;
+                ModelBinder = bindingContext.ModelBinder;
+                ValidatorProvider = bindingContext.ValidatorProvider;
+                HttpContext = bindingContext.HttpContext;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the <see cref="HttpContext"/> for the current request.
+        /// </summary>
+        public HttpContext HttpContext { get; set; }
+
+        /// <summary>
+        /// Gets unaltered value provider collection.
+        /// Value providers can be filtered by specific model binders.
+        /// </summary>
+        public IValueProvider OriginalValueProvider { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelBinder"/> associated with this context.
+        /// </summary>
+        public IModelBinder ModelBinder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelMetadataProvider"/> associated with this context.
+        /// </summary>
+        public IModelMetadataProvider MetadataProvider { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="IModelValidatorProvider"/> instance used for model validation with this
+        /// context.
+        /// </summary>
+        public IModelValidatorProvider ValidatorProvider { get; set; }
+    }
+}

src/Microsoft.AspNet.Mvc.ModelBinding/Validation/ModelValidationContext.cs

@@ -9,8 +9,8 @@ public class ModelValidationContext
     {
         public ModelValidationContext([NotNull] ModelBindingContext bindingContext,
                                       [NotNull] ModelMetadata metadata)
-            : this(bindingContext.MetadataProvider,
-                   bindingContext.ValidatorProvider,
+            : this(bindingContext.OperationBindingContext.MetadataProvider,
+                   bindingContext.OperationBindingContext.ValidatorProvider,
                    bindingContext.ModelState,
                    metadata,
                    bindingContext.ModelMetadata)