huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing dictionary overloads from MapRoute.

This commit is contained in:
harshgMSFT 2014-06-18 12:10:54 -07:00
parent a6c872bb08
commit cef4a3ec05
1 changed files with 14 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs
View File

@ -23,31 +23,7 @@ namespace Microsoft.AspNet.Routing
string template, string template,
object defaults) object defaults)
{ {
MapRoute(routeCollectionBuilder, name, template, new RouteValueDictionary(defaults)); return MapRoute(routeCollectionBuilder, name, template, defaults, constraints: null);
return routeCollectionBuilder;
}
public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder,
string name,
string template,
IDictionary<string, object> defaults)
{
if (routeCollectionBuilder.DefaultHandler == null)
{
throw new InvalidOperationException(Resources.DefaultHandler_MustBeSet);
}
var inlineConstraintResolver = routeCollectionBuilder
.ServiceProvider
.GetService<IInlineConstraintResolver>();
routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler,
name,
template,
defaults,
constraints: null,
inlineConstraintResolver: inlineConstraintResolver));
return routeCollectionBuilder;
} }
public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder, public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder,
@ -55,39 +31,6 @@ namespace Microsoft.AspNet.Routing
string template, string template,
object defaults, object defaults,
object constraints) object constraints)
{
MapRoute(routeCollectionBuilder,
name,
template,
new RouteValueDictionary(defaults),
new RouteValueDictionary(constraints));
return routeCollectionBuilder;
}
public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder,
string name,
string template,
object defaults,
IDictionary<string, object> constraints)
{
MapRoute(routeCollectionBuilder, name, template, new RouteValueDictionary(defaults), constraints);
return routeCollectionBuilder;
}
public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder,
string name,
string template,
IDictionary<string, object> defaults, object constraints)
{
MapRoute(routeCollectionBuilder, name, template, defaults, new RouteValueDictionary(constraints));
return routeCollectionBuilder;
}
public static IRouteBuilder MapRoute(this IRouteBuilder routeCollectionBuilder,
string name,
string template,
IDictionary<string, object> defaults,
IDictionary<string, object> constraints)
{ {
if (routeCollectionBuilder.DefaultHandler == null) if (routeCollectionBuilder.DefaultHandler == null)
{ {
@ -100,10 +43,21 @@ namespace Microsoft.AspNet.Routing
routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler, routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler,
name, name,
template, template,
defaults, ObjectToDictionary(defaults),
constraints, ObjectToDictionary(constraints),
inlineConstraintResolver)); inlineConstraintResolver));
return routeCollectionBuilder; return routeCollectionBuilder;
} }
private static IDictionary<string, object> ObjectToDictionary(object value)
{
var dictionary = value as IDictionary<string, object>;
if (dictionary != null)
{
return dictionary;
}
return new RouteValueDictionary(value);
}
} }
} }