MinimalActions -> DelegateEndpoints in analyzer

halter73 · halter73 · commit 72c939e2b4c9 · 2021-08-20T17:38:52.000-07:00
diff --git a/src/Framework/Analyzer/src/DelegateEndpoints/DelegateEndpointAnalyzer.cs b/src/Framework/Analyzer/src/DelegateEndpoints/DelegateEndpointAnalyzer.cs
@@ -8,14 +8,14 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.MinimalActions;
+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-public partial class MinimalActionAnalyzer : DiagnosticAnalyzer
+public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
 {
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(new[]
     {
-        DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters,
+        DiagnosticDescriptors.DoNotUseModelBindingAttributesOnDelegateEndpointParameters,
     });
 
     public override void Initialize(AnalysisContext context)
@@ -35,7 +35,7 @@ public override void Initialize(AnalysisContext context)
             {
                 var invocation = (IInvocationOperation)operationAnalysisContext.Operation;
                 var targetMethod = invocation.TargetMethod;
-                if (IsMapActionInvocation(wellKnownTypes, invocation, targetMethod))
+                if (IsDelegateHandlerInvocation(wellKnownTypes, invocation, targetMethod))
                 {
                     return;
                 }
@@ -60,13 +60,13 @@ public override void Initialize(AnalysisContext context)
         });
     }
 
-    private static bool IsMapActionInvocation(
+    private static bool IsDelegateHandlerInvocation(
         WellKnownTypes wellKnownTypes,
         IInvocationOperation invocation,
         IMethodSymbol targetMethod)
     {
         return !targetMethod.Name.StartsWith("Map", StringComparison.Ordinal) ||
-            !SymbolEqualityComparer.Default.Equals(wellKnownTypes.MinimalActionEndpointRouteBuilderExtensions, targetMethod.ContainingType) ||
+            !SymbolEqualityComparer.Default.Equals(wellKnownTypes.DelegateEndpointRouteBuilderExtensions, targetMethod.ContainingType) ||
             invocation.Arguments.Length != 3;
     }
 }
diff --git a/src/Framework/Analyzer/src/DelegateEndpoints/DiagnosticDescriptors.cs b/src/Framework/Analyzer/src/DelegateEndpoints/DiagnosticDescriptors.cs
@@ -3,15 +3,15 @@
 
 using Microsoft.CodeAnalysis;
 
-namespace Microsoft.AspNetCore.Analyzers.MinimalActions
+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
     internal static class DiagnosticDescriptors
     {
-        internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnMinimalActionParameters = new(
+        internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnDelegateEndpointParameters = new(
             "ASP0003",
-            "Do not use model binding attributes with Map actions",
-            "{0} should not be specified for a {1} delegate parameter",
+            "Do not use model binding attributes with Map handlers",
+            "{0} should not be specified for a {1} Delegate parameter",
             "Usage",
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true,
diff --git a/src/Framework/Analyzer/src/DelegateEndpoints/DisallowMvcBindArgumentsOnParameters.cs b/src/Framework/Analyzer/src/DelegateEndpoints/DisallowMvcBindArgumentsOnParameters.cs
@@ -6,9 +6,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
-namespace Microsoft.AspNetCore.Analyzers.MinimalActions;
+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
 
-public partial class MinimalActionAnalyzer : DiagnosticAnalyzer
+public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer
 {
     private static void DisallowMvcBindArgumentsOnParameters(
         in OperationAnalysisContext context,
@@ -33,7 +33,7 @@ private static void DisallowMvcBindArgumentsOnParameters(
                 var methodName = invocation.TargetMethod.Name;
 
                 context.ReportDiagnostic(Diagnostic.Create(
-                    DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters,
+                    DiagnosticDescriptors.DoNotUseModelBindingAttributesOnDelegateEndpointParameters,
                     location,
                     modelBindingAttribute.AttributeClass.Name,
                     methodName));
diff --git a/src/Framework/Analyzer/src/DelegateEndpoints/WellKnownTypes.cs b/src/Framework/Analyzer/src/DelegateEndpoints/WellKnownTypes.cs
@@ -4,15 +4,15 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CodeAnalysis;
 
-namespace Microsoft.AspNetCore.Analyzers.MinimalActions;
+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;
 
 internal sealed class WellKnownTypes
 {
     public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out WellKnownTypes? wellKnownTypes)
     {
         wellKnownTypes = default;
-        const string MinimalActionEndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.MinimalActionEndpointRouteBuilderExtensions";
-        if (compilation.GetTypeByMetadataName(MinimalActionEndpointRouteBuilderExtensions) is not { } minimalActionEndpointRouteBuilderExtensions)
+        const string DelegateEndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions";
+        if (compilation.GetTypeByMetadataName(DelegateEndpointRouteBuilderExtensions) is not { } delegateEndpointRouteBuilderExtensions)
         {
             return false;
         }
@@ -33,15 +33,15 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We
 
         wellKnownTypes = new WellKnownTypes
         {
-            MinimalActionEndpointRouteBuilderExtensions = minimalActionEndpointRouteBuilderExtensions,
+            DelegateEndpointRouteBuilderExtensions = delegateEndpointRouteBuilderExtensions,
             IBinderTypeProviderMetadata = ibinderTypeProviderMetadata,
             BindAttribute = bindAttribute,
         };
 
         return true;
     }
 
-    public ITypeSymbol MinimalActionEndpointRouteBuilderExtensions { get; private init; }
+    public ITypeSymbol DelegateEndpointRouteBuilderExtensions { get; private init; }
     public INamedTypeSymbol IBinderTypeProviderMetadata { get; private init; }
     public INamedTypeSymbol BindAttribute { get; private init; }
 }
diff --git a/src/Http/Routing/test/FunctionalTests/DelegateEndpointTest.cs b/src/Http/Routing/test/FunctionalTests/DelegateEndpointTest.cs
@@ -3,21 +3,17 @@
 
 #nullable enable
 
-using System;
 using System.Net.Http.Json;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Xunit;
 
 namespace Microsoft.AspNetCore.Routing.FunctionalTests
 {
-    public class MapDelegateTest
+    public class DelegateEndpointTest
     {
         [Fact]
         public async Task MapPost_FromBodyWorksWithJsonPayload()

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@`
`8`	`8`	`using Microsoft.CodeAnalysis.Diagnostics;`
`9`	`9`	`using Microsoft.CodeAnalysis.Operations;`
`10`	`10`
`11`		`-namespace Microsoft.AspNetCore.Analyzers.MinimalActions;`
	`11`	`+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;`
`12`	`12`
`13`	`13`	`[DiagnosticAnalyzer(LanguageNames.CSharp)]`
`14`		`-public partial class MinimalActionAnalyzer : DiagnosticAnalyzer`
	`14`	`+public partial class DelegateEndpointAnalyzer : DiagnosticAnalyzer`
`15`	`15`	`{`
`16`	`16`	`public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(new[]`
`17`	`17`	`{`
`18`		`- DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters,`
	`18`	`+ DiagnosticDescriptors.DoNotUseModelBindingAttributesOnDelegateEndpointParameters,`
`19`	`19`	`});`
`20`	`20`
`21`	`21`	`public override void Initialize(AnalysisContext context)`
`@@ -35,7 +35,7 @@ public override void Initialize(AnalysisContext context)`
`35`	`35`	`{`
`36`	`36`	`var invocation = (IInvocationOperation)operationAnalysisContext.Operation;`
`37`	`37`	`var targetMethod = invocation.TargetMethod;`
`38`		`- if (IsMapActionInvocation(wellKnownTypes, invocation, targetMethod))`
	`38`	`+ if (IsDelegateHandlerInvocation(wellKnownTypes, invocation, targetMethod))`
`39`	`39`	`{`
`40`	`40`	`return;`
`41`	`41`	`}`
`@@ -60,13 +60,13 @@ public override void Initialize(AnalysisContext context)`
`60`	`60`	`});`
`61`	`61`	`}`
`62`	`62`
`63`		`- private static bool IsMapActionInvocation(`
	`63`	`+ private static bool IsDelegateHandlerInvocation(`
`64`	`64`	`WellKnownTypes wellKnownTypes,`
`65`	`65`	`IInvocationOperation invocation,`
`66`	`66`	`IMethodSymbol targetMethod)`
`67`	`67`	`{`
`68`	`68`	`return !targetMethod.Name.StartsWith("Map", StringComparison.Ordinal) \|\|`
`69`		`- !SymbolEqualityComparer.Default.Equals(wellKnownTypes.MinimalActionEndpointRouteBuilderExtensions, targetMethod.ContainingType) \|\|`
	`69`	`+ !SymbolEqualityComparer.Default.Equals(wellKnownTypes.DelegateEndpointRouteBuilderExtensions, targetMethod.ContainingType) \|\|`
`70`	`70`	`invocation.Arguments.Length != 3;`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`using System.Diagnostics.CodeAnalysis;`
`5`	`5`	`using Microsoft.CodeAnalysis;`
`6`	`6`
`7`		`-namespace Microsoft.AspNetCore.Analyzers.MinimalActions;`
	`7`	`+namespace Microsoft.AspNetCore.Analyzers.DelegateEndpoints;`
`8`	`8`
`9`	`9`	`internal sealed class WellKnownTypes`
`10`	`10`	`{`
`11`	`11`	`public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out WellKnownTypes? wellKnownTypes)`
`12`	`12`	`{`
`13`	`13`	`wellKnownTypes = default;`
`14`		`- const string MinimalActionEndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.MinimalActionEndpointRouteBuilderExtensions";`
`15`		`- if (compilation.GetTypeByMetadataName(MinimalActionEndpointRouteBuilderExtensions) is not { } minimalActionEndpointRouteBuilderExtensions)`
	`14`	`+ const string DelegateEndpointRouteBuilderExtensions = "Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions";`
	`15`	`+ if (compilation.GetTypeByMetadataName(DelegateEndpointRouteBuilderExtensions) is not { } delegateEndpointRouteBuilderExtensions)`
`16`	`16`	`{`
`17`	`17`	`return false;`
`18`	`18`	`}`
`@@ -33,15 +33,15 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We`
`33`	`33`
`34`	`34`	`wellKnownTypes = new WellKnownTypes`
`35`	`35`	`{`
`36`		`- MinimalActionEndpointRouteBuilderExtensions = minimalActionEndpointRouteBuilderExtensions,`
	`36`	`+ DelegateEndpointRouteBuilderExtensions = delegateEndpointRouteBuilderExtensions,`
`37`	`37`	`IBinderTypeProviderMetadata = ibinderTypeProviderMetadata,`
`38`	`38`	`BindAttribute = bindAttribute,`
`39`	`39`	`};`
`40`	`40`
`41`	`41`	`return true;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public ITypeSymbol MinimalActionEndpointRouteBuilderExtensions { get; private init; }`
	`44`	`+ public ITypeSymbol DelegateEndpointRouteBuilderExtensions { get; private init; }`
`45`	`45`	`public INamedTypeSymbol IBinderTypeProviderMetadata { get; private init; }`
`46`	`46`	`public INamedTypeSymbol BindAttribute { get; private init; }`
`47`	`47`	`}`