Use ApplicationName instead of "Map" if no declaring type

Author: halter73

src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs

@@ -16,26 +16,32 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Patterns;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Mvc.ApiExplorer
 {
     internal class EndpointMetadataApiDescriptionProvider : IApiDescriptionProvider
     {
         private readonly EndpointDataSource _endpointDataSource;
+        private readonly IHostEnvironment _environment;
         private readonly IServiceProviderIsService? _serviceProviderIsService;
 
         // Executes before MVC's DefaultApiDescriptionProvider and GrpcHttpApiDescriptionProvider for no particular reason :D
         public int Order => -1100;
 
-        public EndpointMetadataApiDescriptionProvider(EndpointDataSource endpointDataSource)
-            : this(endpointDataSource, null)
+        public EndpointMetadataApiDescriptionProvider(EndpointDataSource endpointDataSource, IHostEnvironment environment)
+            : this(endpointDataSource, environment, null)
         {
         }
 
-        public EndpointMetadataApiDescriptionProvider(EndpointDataSource endpointDataSource, IServiceProviderIsService? serviceProviderIsService)
+        public EndpointMetadataApiDescriptionProvider(
+            EndpointDataSource endpointDataSource,
+            IHostEnvironment environment,
+            IServiceProviderIsService? serviceProviderIsService)
         {
             _endpointDataSource = endpointDataSource;
+            _environment = environment;
             _serviceProviderIsService = serviceProviderIsService;
         }
 
@@ -76,7 +82,7 @@ private ApiDescription CreateApiDescription(RouteEndpoint routeEndpoint, string
             {
                 // If the declaring type is null or compiler-generated (e.g. lambdas),
                 // group the methods under a "Map" controller.
-                controllerName = "Map";
+                controllerName = _environment.ApplicationName;
             }
 
             var apiDescription = new ApiDescription

src/Mvc/Mvc.ApiExplorer/test/EndpointMetadataApiDescriptionProviderTest.cs

@@ -12,6 +12,8 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Patterns;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.ApiExplorer
@@ -44,11 +46,11 @@ public void UsesDeclaringTypeAsControllerName()
         }
 
         [Fact]
-        public void UsesMapAsControllerNameIfNoDeclaringType()
+        public void UsesApplicationNameAsControllerNameIfNoDeclaringType()
         {
             var apiDescription = GetApiDescription(() => { });
 
-            Assert.Equal("Map", apiDescription.ActionDescriptor.RouteValues["controller"]);
+            Assert.Equal(nameof(EndpointMetadataApiDescriptionProviderTest), apiDescription.ActionDescriptor.RouteValues["controller"]);
         }
 
         [Fact]
@@ -324,8 +326,12 @@ private IList<ApiDescription> GetApiDescriptions(
 
             var endpoint = new RouteEndpoint(httpContext => Task.CompletedTask, routePattern, 0, endpointMetadata, null);
             var endpointDataSource = new DefaultEndpointDataSource(endpoint);
+            var hostEnvironment = new HostEnvironment
+            {
+                ApplicationName = nameof(EndpointMetadataApiDescriptionProviderTest)
+            };
 
-            var provider = new EndpointMetadataApiDescriptionProvider(endpointDataSource, new ServiceProviderIsService());
+            var provider = new EndpointMetadataApiDescriptionProvider(endpointDataSource, hostEnvironment, new ServiceProviderIsService());
 
             provider.OnProvidersExecuting(context);
             provider.OnProvidersExecuted(context);
@@ -360,5 +366,13 @@ private class ServiceProviderIsService : IServiceProviderIsService
         {
             public bool IsService(Type serviceType) => serviceType == typeof(IInferredServiceInterface);
         }
+ 
+        private class HostEnvironment : IHostEnvironment
+        {
+            public string EnvironmentName { get; set; }
+            public string ApplicationName { get; set; }
+            public string ContentRootPath { get; set; }
+            public IFileProvider ContentRootFileProvider { get; set; }
+        }
     }
 }