Address more pr feedback

Author: halter73

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -1297,7 +1297,6 @@ public async Task NoExceptionAreThrownForBadRequestsInProduction()
 
             app.MapGet("/{parameterName}", (int parameterName) => { });
 
-
             await app.StartAsync();
 
             var client = app.GetTestClient();

src/Http/Routing/src/Builder/DelegateEndpointRouteBuilderExtensions.cs

@@ -170,14 +170,13 @@ public static DelegateEndpointConventionBuilder Map(
                 routeParams.Add(part.Name);
             }
 
-            // REVIEW: Should we just default ThrowOnBadRequest to false if Options is somehow missing?
-            var routeHandlerOptions = endpoints.ServiceProvider.GetRequiredService<IOptions<RouteHandlerOptions>>();
+            var routeHandlerOptions = endpoints.ServiceProvider?.GetService<IOptions<RouteHandlerOptions>>();
 
             var options = new RequestDelegateFactoryOptions
             {
                 ServiceProvider = endpoints.ServiceProvider,
                 RouteParameterNames = routeParams,
-                ThrowOnBadRequest = routeHandlerOptions.Value.ThrowOnBadRequest
+                ThrowOnBadRequest = routeHandlerOptions?.Value.ThrowOnBadRequest ?? false,
             };
 
             var requestDelegateResult = RequestDelegateFactory.Create(handler, options);

src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs

@@ -99,7 +99,7 @@ public static IServiceCollection AddRouting(this IServiceCollection services)
             services.TryAddSingleton<TemplateBinderFactory, DefaultTemplateBinderFactory>();
             services.TryAddSingleton<RoutePatternTransformer, DefaultRoutePatternTransformer>();
 
-            // if (_environment.IsDevelopment()) RouteHandlerOptions.ThrowOnBadRequest = true;
+            // Set RouteHandlerOptions.ThrowOnBadRequest in development
             services.TryAddEnumerable(ServiceDescriptor.Transient<IConfigureOptions<RouteHandlerOptions>, ConfigureRouteHandlerOptions>());
 
             return services;

src/Http/Routing/test/UnitTests/Builder/DelegateEndpointRouteBuilderExtensionsTest.cs

@@ -488,13 +488,6 @@ public void WithTags_CanSetTagsForEndpoint()
             Assert.Equal(new[] { "Some", "Test", "Tags" }, tagsMetadata?.Tags);
         }
 
-        [Fact]
-        public void MapMethod_ThrowsIfItCannotResolveRouteHandlerOptions()
-        {
-            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new ServiceCollection().BuildServiceProvider()));
-            Assert.Throws<InvalidOperationException>(() => builder.Map("/", () => { }));
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
@@ -526,6 +519,25 @@ public async Task MapMethod_FlowsThrowOnBadHttpRequest(bool throwOnBadRequest)
             }
         }
 
+        [Fact]
+        public async Task MapMethod_DefaultsToNotThrowOnBadHttpRequestIfItCannotResolveRouteHandlerOptions()
+        {
+            var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(new ServiceCollection().BuildServiceProvider()));
+
+            _ = builder.Map("/{id}", (int id) => { });
+
+            var dataSource = GetBuilderEndpointDataSource(builder);
+            // Trigger Endpoint build by calling getter.
+            var endpoint = Assert.Single(dataSource.Endpoints);
+
+            var httpContext = new DefaultHttpContext();
+            httpContext.RequestServices = new ServiceCollection().AddLogging().BuildServiceProvider();
+            httpContext.Request.RouteValues["id"] = "invalid!";
+
+            await endpoint.RequestDelegate!(httpContext);
+            Assert.Equal(400, httpContext.Response.StatusCode);
+        }
+
         class FromRoute : Attribute, IFromRouteMetadata
         {
             public string? Name { get; set; }