added query string constraints to output of route logger.

mccalltd · Mar 12, 2013 · bd27d42 · bd27d42
1 parent 81738b4
commit bd27d42
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/AttributeRouting.Web.Http.SelfHost/Logging/LoggingExtensions.cs b/src/AttributeRouting.Web.Http.SelfHost/Logging/LoggingExtensions.cs
@@ -24,8 +24,9 @@ public static void LogTo(this HttpRoute route, TextWriter writer)
             var attributeRoute = route as IAttributeRoute;
             var info = RouteLoggingInfo.GetRouteInfo(route.RouteTemplate,
                                                      route.Defaults,
+                                                     attributeRoute.SafeGet(r => r.QueryStringDefaults),
                                                      route.Constraints,
-                                                     attributeRoute.SafeGet(x => x.QueryStringConstraints),
+                                                     attributeRoute.SafeGet(r => r.QueryStringConstraints),
                                                      route.DataTokens);
 
             LogWriter.LogRoute(writer, route.RouteTemplate, info);

diff --git a/src/AttributeRouting.Web/Logging/LogRoutesHandler.cs b/src/AttributeRouting.Web/Logging/LogRoutesHandler.cs
@@ -95,13 +95,14 @@ private string GetOutput()
 
         private static IEnumerable<object> GetRouteInfo()
         {
-            return from r in RouteTable.Routes.OfType<Route>()
-                   let ar = r as IAttributeRoute
-                   let routeInfo = RouteLoggingInfo.GetRouteInfo(r.Url,
-                                                                 r.Defaults,
-                                                                 r.Constraints,
-                                                                 ar.SafeGet(x => x.QueryStringConstraints),
-                                                                 r.DataTokens)
+            return from route in RouteTable.Routes.OfType<Route>()
+                   let attributeRoute = route as IAttributeRoute
+                   let routeInfo = RouteLoggingInfo.GetRouteInfo(route.Url,
+                                                                 route.Defaults,
+                                                                 attributeRoute.SafeGet(r => r.QueryStringDefaults),
+                                                                 route.Constraints,
+                                                                 attributeRoute.SafeGet(r => r.QueryStringConstraints),
+                                                                 route.DataTokens)
                    select new
                    {
                        methods = routeInfo.HttpMethods,

diff --git a/src/AttributeRouting.Web/Logging/LoggingExtensions.cs b/src/AttributeRouting.Web/Logging/LoggingExtensions.cs
@@ -28,6 +28,7 @@ public static void LogTo(this Route route, TextWriter writer)
             var name = attributeRoute.SafeGet(r => r.RouteName);
             var info = RouteLoggingInfo.GetRouteInfo(route.Url,
                                                      route.Defaults,
+                                                     attributeRoute.SafeGet(r => r.QueryStringDefaults),
                                                      route.Constraints,
                                                      attributeRoute.SafeGet(r => r.QueryStringConstraints),
                                                      route.DataTokens);

diff --git a/src/AttributeRouting/Logging/RouteLoggingInfo.cs b/src/AttributeRouting/Logging/RouteLoggingInfo.cs
@@ -23,6 +23,7 @@ public RouteLoggingInfo()
 
         public static RouteLoggingInfo GetRouteInfo(string url,
                                                       IDictionary<string, object> defaults,
+                                                      IDictionary<string, object> queryStringDefaults,
                                                       IDictionary<string, object> constraints,
                                                       IDictionary<string, object> queryStringConstraints,
                                                       IDictionary<string, object> dataTokens)
@@ -41,6 +42,14 @@ public static RouteLoggingInfo GetRouteInfo(string url,
                     item.Defaults.Add(@default.Key, defaultValue.ValueOr("Optional"));
                 }
             }
+            if (queryStringDefaults != null)
+            {
+                foreach (var @default in queryStringDefaults)
+                {
+                    var defaultValue = @default.Value.ToString();
+                    item.Defaults.Add(@default.Key, defaultValue);
+                }
+            }
 
             //************************
             // Constraints