Rename metadata to IFromFormMetadata

martincostello · martincostello · commit 9a0e5e22d510 · 2021-11-09T17:49:28.000Z
Rename IFromFileMetadata to IFromFormMetadata.
diff --git a/src/Http/Http.Abstractions/src/Metadata/IFromFormMetadata.cs b/src/Http/Http.Abstractions/src/Metadata/IFromFormMetadata.cs
@@ -4,12 +4,12 @@
 namespace Microsoft.AspNetCore.Http.Metadata;
 
 /// <summary>
-/// Interface marking attributes that specify a parameter should be bound using a form file from the request body.
+/// Interface marking attributes that specify a parameter should be bound using a form field from the request body.
 /// </summary>
-public interface IFromFileMetadata
+public interface IFromFormMetadata
 {
     /// <summary>
-    /// The file name.
+    /// The form field name.
     /// </summary>
     string? Name { get; }
 }
diff --git a/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt b/src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt
@@ -14,8 +14,8 @@ Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata.IsOptional.get -> bool
 Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata.RequestType.get -> System.Type?
 Microsoft.AspNetCore.Http.Metadata.IFromBodyMetadata
 Microsoft.AspNetCore.Http.Metadata.IFromBodyMetadata.AllowEmpty.get -> bool
-Microsoft.AspNetCore.Http.Metadata.IFromFileMetadata
-Microsoft.AspNetCore.Http.Metadata.IFromFileMetadata.Name.get -> string?
+Microsoft.AspNetCore.Http.Metadata.IFromFormMetadata
+Microsoft.AspNetCore.Http.Metadata.IFromFormMetadata.Name.get -> string?
 Microsoft.AspNetCore.Http.Metadata.IFromHeaderMetadata
 Microsoft.AspNetCore.Http.Metadata.IFromHeaderMetadata.Name.get -> string?
 Microsoft.AspNetCore.Http.Metadata.IFromQueryMetadata
diff --git a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs
@@ -249,7 +249,7 @@ private static Expression CreateArgument(ParameterInfo parameter, FactoryContext
             factoryContext.TrackedParameters.Add(parameter.Name, RequestDelegateFactoryConstants.BodyAttribute);
             return BindParameterFromBody(parameter, bodyAttribute.AllowEmpty, factoryContext);
         }
-        else if (parameterCustomAttributes.OfType<IFromFileMetadata>().FirstOrDefault() is { } fileAttribute)
+        else if (parameterCustomAttributes.OfType<IFromFormMetadata>().FirstOrDefault() is { } fileAttribute)
         {
             return BindParameterFromFormFile(parameter, fileAttribute.Name ?? parameter.Name, factoryContext, RequestDelegateFactoryConstants.FormFileAttribute);
         }
diff --git a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs
@@ -3843,7 +3843,7 @@ private class FromBodyAttribute : Attribute, IFromBodyMetadata
         public bool AllowEmpty { get; set; }
     }
 
-    private class FromFormFileAttribute : Attribute, IFromFileMetadata
+    private class FromFormFileAttribute : Attribute, IFromFormMetadata
     {
         public string? Name { get; set; }
     }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ private static Expression CreateArgument(ParameterInfo parameter, FactoryContext`
`249`	`249`	`factoryContext.TrackedParameters.Add(parameter.Name, RequestDelegateFactoryConstants.BodyAttribute);`
`250`	`250`	`return BindParameterFromBody(parameter, bodyAttribute.AllowEmpty, factoryContext);`
`251`	`251`	`}`
`252`		`- else if (parameterCustomAttributes.OfType<IFromFileMetadata>().FirstOrDefault() is { } fileAttribute)`
	`252`	`+ else if (parameterCustomAttributes.OfType<IFromFormMetadata>().FirstOrDefault() is { } fileAttribute)`
`253`	`253`	`{`
`254`	`254`	`return BindParameterFromFormFile(parameter, fileAttribute.Name ?? parameter.Name, factoryContext, RequestDelegateFactoryConstants.FormFileAttribute);`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3843,7 +3843,7 @@ private class FromBodyAttribute : Attribute, IFromBodyMetadata`
`3843`	`3843`	`public bool AllowEmpty { get; set; }`
`3844`	`3844`	`}`
`3845`	`3845`
`3846`		`- private class FromFormFileAttribute : Attribute, IFromFileMetadata`
	`3846`	`+ private class FromFormFileAttribute : Attribute, IFromFormMetadata`
`3847`	`3847`	`{`
`3848`	`3848`	`public string? Name { get; set; }`
`3849`	`3849`	`}`