This repository has been archived by the owner on Dec 14, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace IModelBindingMessageProvider with new highly-virtual base cla…
- Loading branch information
1 parent
f68bea2
commit 014a786
Showing
17 changed files
with
276 additions
and
251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 6 additions & 2 deletions
8
src/Microsoft.AspNetCore.Mvc.Abstractions/breakingchanges.netcore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,11 @@ | ||
| [ | ||
| { | ||
| "TypeId": "public interface Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IModelBindingMessageProvider", | ||
| "MemberId": "System.Func<System.String> get_MissingRequestBodyRequiredValueAccessor()", | ||
| "Kind": "Addition" | ||
| "Kind": "Removal" | ||
| }, | ||
| { | ||
| "TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata : System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>", | ||
| "MemberId": "public abstract Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IModelBindingMessageProvider get_ModelBindingMessageProvider()", | ||
| "Kind": "Removal" | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
196 changes: 196 additions & 0 deletions
196
...Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| // 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; | ||
| using Microsoft.AspNetCore.Mvc.Core; | ||
|
|
||
| namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata | ||
| { | ||
| /// <summary> | ||
| /// Read / write <see cref="ModelBindingMessageProvider"/> implementation. | ||
| /// </summary> | ||
| public class DefaultModelBindingMessageProvider : ModelBindingMessageProvider | ||
| { | ||
| private Func<string, string> _missingBindRequiredValueAccessor; | ||
| private Func<string> _missingKeyOrValueAccessor; | ||
| private Func<string> _missingRequestBodyRequiredValueAccessor; | ||
| private Func<string, string> _valueMustNotBeNullAccessor; | ||
| private Func<string, string, string> _attemptedValueIsInvalidAccessor; | ||
| private Func<string, string> _unknownValueIsInvalidAccessor; | ||
| private Func<string, string> _valueIsInvalidAccessor; | ||
| private Func<string, string> _valueMustBeANumberAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="DefaultModelBindingMessageProvider"/> class. | ||
| /// </summary> | ||
| public DefaultModelBindingMessageProvider() | ||
| { | ||
| SetMissingBindRequiredValueAccessor(Resources.FormatModelBinding_MissingBindRequiredMember); | ||
| SetMissingKeyOrValueAccessor(Resources.FormatKeyValuePair_BothKeyAndValueMustBePresent); | ||
| SetMissingRequestBodyRequiredValueAccessor(Resources.FormatModelBinding_MissingRequestBodyRequiredMember); | ||
| SetValueMustNotBeNullAccessor(Resources.FormatModelBinding_NullValueNotValid); | ||
| SetAttemptedValueIsInvalidAccessor(Resources.FormatModelState_AttemptedValueIsInvalid); | ||
| SetUnknownValueIsInvalidAccessor(Resources.FormatModelState_UnknownValueIsInvalid); | ||
| SetValueIsInvalidAccessor(Resources.FormatHtmlGeneration_ValueIsInvalid); | ||
| SetValueMustBeANumberAccessor(Resources.FormatHtmlGeneration_ValueMustBeNumber); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="DefaultModelBindingMessageProvider"/> class based on | ||
| /// <paramref name="originalProvider"/>. | ||
| /// </summary> | ||
| /// <param name="originalProvider">The <see cref="DefaultModelBindingMessageProvider"/> to duplicate.</param> | ||
| public DefaultModelBindingMessageProvider(DefaultModelBindingMessageProvider originalProvider) | ||
| { | ||
| if (originalProvider == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(originalProvider)); | ||
| } | ||
|
|
||
| SetMissingBindRequiredValueAccessor(originalProvider.MissingBindRequiredValueAccessor); | ||
| SetMissingKeyOrValueAccessor(originalProvider.MissingKeyOrValueAccessor); | ||
| SetMissingRequestBodyRequiredValueAccessor(originalProvider.MissingRequestBodyRequiredValueAccessor); | ||
| SetValueMustNotBeNullAccessor(originalProvider.ValueMustNotBeNullAccessor); | ||
| SetAttemptedValueIsInvalidAccessor(originalProvider.AttemptedValueIsInvalidAccessor); | ||
| SetUnknownValueIsInvalidAccessor(originalProvider.UnknownValueIsInvalidAccessor); | ||
| SetValueIsInvalidAccessor(originalProvider.ValueIsInvalidAccessor); | ||
| SetValueMustBeANumberAccessor(originalProvider.ValueMustBeANumberAccessor); | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string> MissingBindRequiredValueAccessor => _missingBindRequiredValueAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="MissingBindRequiredValueAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="missingBindRequiredValueAccessor">The value to set.</param> | ||
| public void SetMissingBindRequiredValueAccessor(Func<string, string> missingBindRequiredValueAccessor) | ||
| { | ||
| if (missingBindRequiredValueAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(missingBindRequiredValueAccessor)); | ||
| } | ||
|
|
||
| _missingBindRequiredValueAccessor = missingBindRequiredValueAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string> MissingKeyOrValueAccessor => _missingKeyOrValueAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="MissingKeyOrValueAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="missingKeyOrValueAccessor">The value to set.</param> | ||
| public void SetMissingKeyOrValueAccessor(Func<string> missingKeyOrValueAccessor) | ||
| { | ||
| if (missingKeyOrValueAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(missingKeyOrValueAccessor)); | ||
| } | ||
|
|
||
| _missingKeyOrValueAccessor = missingKeyOrValueAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string> MissingRequestBodyRequiredValueAccessor => _missingRequestBodyRequiredValueAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="MissingRequestBodyRequiredValueAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="missingRequestBodyRequiredValueAccessor">The value to set.</param> | ||
| public void SetMissingRequestBodyRequiredValueAccessor(Func<string> missingRequestBodyRequiredValueAccessor) | ||
| { | ||
| if (missingRequestBodyRequiredValueAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(missingRequestBodyRequiredValueAccessor)); | ||
| } | ||
|
|
||
| _missingRequestBodyRequiredValueAccessor = missingRequestBodyRequiredValueAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string> ValueMustNotBeNullAccessor => _valueMustNotBeNullAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="ValueMustNotBeNullAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="valueMustNotBeNullAccessor">The value to set.</param> | ||
| public void SetValueMustNotBeNullAccessor(Func<string, string> valueMustNotBeNullAccessor) | ||
| { | ||
| if (valueMustNotBeNullAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(valueMustNotBeNullAccessor)); | ||
| } | ||
|
|
||
| _valueMustNotBeNullAccessor = valueMustNotBeNullAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string, string> AttemptedValueIsInvalidAccessor => _attemptedValueIsInvalidAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="AttemptedValueIsInvalidAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="attemptedValueIsInvalidAccessor">The value to set.</param> | ||
| public void SetAttemptedValueIsInvalidAccessor(Func<string, string, string> attemptedValueIsInvalidAccessor) | ||
| { | ||
| if (attemptedValueIsInvalidAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(attemptedValueIsInvalidAccessor)); | ||
| } | ||
|
|
||
| _attemptedValueIsInvalidAccessor = attemptedValueIsInvalidAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string> UnknownValueIsInvalidAccessor => _unknownValueIsInvalidAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="UnknownValueIsInvalidAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="unknownValueIsInvalidAccessor">The value to set.</param> | ||
| public void SetUnknownValueIsInvalidAccessor(Func<string, string> unknownValueIsInvalidAccessor) | ||
| { | ||
| if (unknownValueIsInvalidAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(unknownValueIsInvalidAccessor)); | ||
| } | ||
|
|
||
| _unknownValueIsInvalidAccessor = unknownValueIsInvalidAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string> ValueIsInvalidAccessor => _valueIsInvalidAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="ValueIsInvalidAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="valueIsInvalidAccessor">The value to set.</param> | ||
| public void SetValueIsInvalidAccessor(Func<string, string> valueIsInvalidAccessor) | ||
| { | ||
| if (valueIsInvalidAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(valueIsInvalidAccessor)); | ||
| } | ||
|
|
||
| _valueIsInvalidAccessor = valueIsInvalidAccessor; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public override Func<string, string> ValueMustBeANumberAccessor => _valueMustBeANumberAccessor; | ||
|
|
||
| /// <summary> | ||
| /// Sets the <see cref="ValueMustBeANumberAccessor"/> property. | ||
| /// </summary> | ||
| /// <param name="valueMustBeANumberAccessor">The value to set.</param> | ||
| public void SetValueMustBeANumberAccessor(Func<string, string> valueMustBeANumberAccessor) | ||
| { | ||
| if (valueMustBeANumberAccessor == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(valueMustBeANumberAccessor)); | ||
| } | ||
|
|
||
| _valueMustBeANumberAccessor = valueMustBeANumberAccessor; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.