Fixup

pranavkm · pranavkm · commit cf031927d220 · 2020-07-24T16:17:48.000-07:00
diff --git a/src/Http/Http.Abstractions/src/Extensions/EndpointBuilder.cs b/src/Http/Http.Abstractions/src/Extensions/EndpointBuilder.cs
@@ -14,7 +14,7 @@ public abstract class EndpointBuilder
         /// <summary>
         /// Gets or sets the delegate used to process requests for the endpoint.
         /// </summary>
-        public RequestDelegate RequestDelegate { get; set; } = default!;
+        public RequestDelegate? RequestDelegate { get; set; }
 
         /// <summary>
         /// Gets or sets the informational display name of this endpoint.
diff --git a/src/Http/Http.Abstractions/src/Routing/Endpoint.cs b/src/Http/Http.Abstractions/src/Routing/Endpoint.cs
@@ -20,7 +20,7 @@ public class Endpoint
         /// </param>
         public Endpoint(
             RequestDelegate requestDelegate,
-            EndpointMetadataCollection metadata,
+            EndpointMetadataCollection? metadata,
             string? displayName)
         {
             // All are allowed to be null
diff --git a/src/Http/Routing.Abstractions/src/IRouteConstraint.cs b/src/Http/Routing.Abstractions/src/IRouteConstraint.cs
@@ -25,7 +25,7 @@ public interface IRouteConstraint : IParameterPolicy
         /// <returns><c>true</c> if the URL parameter contains a valid value; otherwise, <c>false</c>.</returns>
         bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection);
diff --git a/src/Http/Routing/src/Constraints/BoolRouteConstraint.cs b/src/Http/Routing/src/Constraints/BoolRouteConstraint.cs
@@ -15,7 +15,7 @@ public class BoolRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs b/src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs
@@ -34,7 +34,7 @@ public CompositeRouteConstraint(IEnumerable<IRouteConstraint> constraints)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs b/src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs
@@ -21,7 +21,7 @@ public class DateTimeRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs b/src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs
@@ -15,7 +15,7 @@ public class DecimalRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs b/src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs
@@ -15,7 +15,7 @@ public class DoubleRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/FileNameRouteConstraint.cs b/src/Http/Routing/src/Constraints/FileNameRouteConstraint.cs
@@ -86,7 +86,7 @@ public class FileNameRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/FloatRouteConstraint.cs b/src/Http/Routing/src/Constraints/FloatRouteConstraint.cs
@@ -15,7 +15,7 @@ public class FloatRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/GuidRouteConstraint.cs b/src/Http/Routing/src/Constraints/GuidRouteConstraint.cs
@@ -17,7 +17,7 @@ public class GuidRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs b/src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs
@@ -36,7 +36,7 @@ public HttpMethodRouteConstraint(params string[] allowedMethods)
         /// <inheritdoc />
         public virtual bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/IntRouteConstraint.cs b/src/Http/Routing/src/Constraints/IntRouteConstraint.cs
@@ -15,7 +15,7 @@ public class IntRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/LengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/LengthRouteConstraint.cs
@@ -72,7 +72,7 @@ public LengthRouteConstraint(int minLength, int maxLength)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
@@ -89,8 +89,8 @@ public bool Match(
 
             if (values.TryGetValue(routeKey, out var value) && value != null)
             {
-                var valueString = Convert.ToString(value, CultureInfo.InvariantCulture);
-                var length = valueString!.Length;
+                var valueString = Convert.ToString(value, CultureInfo.InvariantCulture)!;
+                var length = valueString.Length;
                 return length >= MinLength && length <= MaxLength;
             }
 
diff --git a/src/Http/Routing/src/Constraints/LongRouteConstraint.cs b/src/Http/Routing/src/Constraints/LongRouteConstraint.cs
@@ -15,7 +15,7 @@ public class LongRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs
@@ -35,7 +35,7 @@ public MaxLengthRouteConstraint(int maxLength)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/MaxRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxRouteConstraint.cs
@@ -29,7 +29,7 @@ public MaxRouteConstraint(long max)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs
@@ -35,7 +35,7 @@ public MinLengthRouteConstraint(int minLength)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/MinRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinRouteConstraint.cs
@@ -29,7 +29,7 @@ public MinRouteConstraint(long min)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/NonFileNameRouteConstraint.cs b/src/Http/Routing/src/Constraints/NonFileNameRouteConstraint.cs
@@ -82,7 +82,7 @@ public class NonFileNameRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/NullRouteConstraint.cs b/src/Http/Routing/src/Constraints/NullRouteConstraint.cs
@@ -13,7 +13,7 @@ private NullRouteConstraint()
         {
         }
 
-        public bool Match(HttpContext? httpContext, IRouter route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection)
+        public bool Match(HttpContext? httpContext, IRouter? route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection)
         {
             return true;
         }
diff --git a/src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs b/src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs
@@ -25,7 +25,7 @@ public OptionalRouteConstraint(IRouteConstraint innerConstraint)
 
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/RangeRouteConstraint.cs b/src/Http/Routing/src/Constraints/RangeRouteConstraint.cs
@@ -43,7 +43,7 @@ public RangeRouteConstraint(long min, long max)
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/RegexRouteConstraint.cs b/src/Http/Routing/src/Constraints/RegexRouteConstraint.cs
@@ -39,7 +39,7 @@ public RegexRouteConstraint(string regexPattern)
 
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs b/src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs
@@ -19,7 +19,7 @@ public class RequiredRouteConstraint : IRouteConstraint
         /// <inheritdoc />
         public bool Match(
             HttpContext? httpContext,
-            IRouter route,
+            IRouter? route,
             string routeKey,
             RouteValueDictionary values,
             RouteDirection routeDirection)
diff --git a/src/Http/Routing/src/Constraints/StringRouteConstraint.cs b/src/Http/Routing/src/Constraints/StringRouteConstraint.cs
@@ -29,7 +29,7 @@ public StringRouteConstraint(string value)
         }
 
         /// <inheritdoc />
-        public bool Match(HttpContext? httpContext, IRouter route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection)
+        public bool Match(HttpContext? httpContext, IRouter? route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection)
         {
             if (routeKey == null)
             {
diff --git a/src/Http/Routing/src/LinkGeneratorEndpointNameAddressExtensions.cs b/src/Http/Routing/src/LinkGeneratorEndpointNameAddressExtensions.cs
@@ -31,7 +31,7 @@ public static class LinkGeneratorEndpointNameAddressExtensions
             this LinkGenerator generator,
             HttpContext httpContext,
             string endpointName,
-            object values,
+            object? values,
             PathString? pathBase = default,
             FragmentString fragment = default,
             LinkOptions? options = default)
@@ -77,7 +77,7 @@ public static class LinkGeneratorEndpointNameAddressExtensions
         public static string? GetPathByName(
             this LinkGenerator generator,
             string endpointName,
-            object values,
+            object? values,
             PathString pathBase = default,
             FragmentString fragment = default,
             LinkOptions? options = default)
@@ -130,7 +130,7 @@ public static class LinkGeneratorEndpointNameAddressExtensions
             this LinkGenerator generator,
             HttpContext httpContext,
             string endpointName,
-            object values,
+            object? values,
             string? scheme = default,
             HostString? host = default,
             PathString? pathBase = default,
@@ -193,7 +193,7 @@ public static class LinkGeneratorEndpointNameAddressExtensions
         public static string? GetUriByName(
             this LinkGenerator generator,
             string endpointName,
-            object values,
+            object? values,
             string scheme,
             HostString host,
             PathString pathBase = default,
diff --git a/src/Http/Routing/src/LinkGeneratorRouteValuesAddressExtensions.cs b/src/Http/Routing/src/LinkGeneratorRouteValuesAddressExtensions.cs
@@ -30,8 +30,8 @@ public static class LinkGeneratorRouteValuesAddressExtensions
         public static string? GetPathByRouteValues(
             this LinkGenerator generator,
             HttpContext httpContext,
-            string routeName,
-            object values,
+            string? routeName,
+            object? values,
             PathString? pathBase = default,
             FragmentString fragment = default,
             LinkOptions? options = default)
@@ -72,8 +72,8 @@ public static class LinkGeneratorRouteValuesAddressExtensions
         /// <returns>A URI with an absolute path, or <c>null</c>.</returns>
         public static string? GetPathByRouteValues(
             this LinkGenerator generator,
-            string routeName,
-            object values,
+            string? routeName,
+            object? values,
             PathString pathBase = default,
             FragmentString fragment = default,
             LinkOptions? options = default)
@@ -121,8 +121,8 @@ public static class LinkGeneratorRouteValuesAddressExtensions
         public static string? GetUriByRouteValues(
             this LinkGenerator generator,
             HttpContext httpContext,
-            string routeName,
-            object values,
+            string? routeName,
+            object? values,
             string? scheme = default,
             HostString? host = default,
             PathString? pathBase = default,
@@ -180,8 +180,8 @@ public static class LinkGeneratorRouteValuesAddressExtensions
         /// </remarks>
         public static string? GetUriByRouteValues(
             this LinkGenerator generator,
-            string routeName,
-            object values,
+            string? routeName,
+            object? values,
             string scheme,
             HostString host,
             PathString pathBase = default,
@@ -197,7 +197,7 @@ public static class LinkGeneratorRouteValuesAddressExtensions
             return generator.GetUriByAddress<RouteValuesAddress>(address, address.ExplicitValues, scheme, host, pathBase, fragment, options);
         }
 
-        private static RouteValuesAddress CreateAddress(HttpContext? httpContext, string routeName, object values)
+        private static RouteValuesAddress CreateAddress(HttpContext? httpContext, string? routeName, object? values)
         {
             return new RouteValuesAddress()
             {
diff --git a/src/Http/Routing/src/Matching/CandidateSet.cs b/src/Http/Routing/src/Matching/CandidateSet.cs
@@ -184,7 +184,9 @@ public void ReplaceEndpoint(int index, Endpoint? endpoint, RouteValueDictionary?
             {
                 ThrowIndexArgumentOutOfRangeException();
             }
-            
+
+            // CandidateState allows a null-valued endpoint. However a validate candidate should never have a null endpoint
+            // We'll make lives easier for matcher policies by declaring it as non-null.
             Candidates[index] = new CandidateState(endpoint!, values, Candidates[index].Score);
 
             if (endpoint == null)
diff --git a/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs b/src/Http/Routing/src/Matching/DefaultEndpointSelector.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
diff --git a/src/Http/Routing/src/Patterns/RoutePatternFactory.cs b/src/Http/Routing/src/Patterns/RoutePatternFactory.cs
@@ -86,7 +86,7 @@ public static RoutePattern Parse(string pattern, object? defaults, object? param
         /// Route values that can be substituted for parameters in the route pattern. See remarks on <see cref="RoutePattern.RequiredValues"/>.
         /// </param>
         /// <returns>The <see cref="RoutePattern"/>.</returns>
-        public static RoutePattern Parse(string pattern, object? defaults, object? parameterPolicies, object requiredValues)
+        public static RoutePattern Parse(string pattern, object? defaults, object? parameterPolicies, object? requiredValues)
         {
             if (pattern == null)
             {
diff --git a/src/Http/Routing/src/RouteEndpoint.cs b/src/Http/Routing/src/RouteEndpoint.cs
@@ -28,7 +28,7 @@ public RouteEndpoint(
             RequestDelegate requestDelegate,
             RoutePattern routePattern,
             int order,
-            EndpointMetadataCollection metadata,
+            EndpointMetadataCollection? metadata,
             string? displayName)
             : base(requestDelegate, metadata, displayName)
         {
diff --git a/src/Http/Routing/src/RouteEndpointBuilder.cs b/src/Http/Routing/src/RouteEndpointBuilder.cs
@@ -1,6 +1,7 @@
 // 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.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing.Patterns;
@@ -25,6 +26,11 @@ public RouteEndpointBuilder(
 
         public override Endpoint Build()
         {
+            if (RequestDelegate is null)
+            {
+                throw new InvalidOperationException($"{nameof(RequestDelegate)} must be specified to construct a {nameof(RouteEndpoint)}.");
+            }
+
             var routeEndpoint = new RouteEndpoint(
                 RequestDelegate,
                 RoutePattern,

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class Endpoint`
`20`	`20`	`/// </param>`
`21`	`21`	`public Endpoint(`
`22`	`22`	`RequestDelegate requestDelegate,`
`23`		`- EndpointMetadataCollection metadata,`
	`23`	`+ EndpointMetadataCollection? metadata,`
`24`	`24`	`string? displayName)`
`25`	`25`	`{`
`26`	`26`	`// All are allowed to be null`