Simplify UrlLookup

Author: russcam

src/Nest/CommonAbstractions/Request/ApiUrls.cs

@@ -15,10 +15,10 @@ internal class ApiUrls
 		/// the cached string builders.
 		/// </summary>
 		private readonly string _fixedUrl;
-		
+
 		/// <summary>
 		/// Creates a lookup for number of parts <=> list of routes with that number of parts.
-		/// <see cref="UrlLookup.Predicate"/> allows us to quickly find the right url to use in the list.
+		/// <see cref="UrlLookup.Matches"/> allows us to quickly find the right url to use in the list.
 		/// </summary>
 		public Dictionary<int, List<UrlLookup>> Routes { get; }
 
@@ -36,9 +36,9 @@ internal ApiUrls(string[] routes)
 					var bracketsCount = route.Count(c => c.Equals('{'));
 					if (Routes == null) Routes = new Dictionary<int, List<UrlLookup>>();
 					if (Routes.ContainsKey(bracketsCount))
-						Routes[bracketsCount].Add(UrlLookup.FromRoute(route));
+						Routes[bracketsCount].Add(new UrlLookup(route));
 					else
-						Routes.Add(bracketsCount, new List<UrlLookup> { UrlLookup.FromRoute(route) });
+						Routes.Add(bracketsCount, new List<UrlLookup> { new UrlLookup(route) });
 				}
 			}
 
@@ -48,26 +48,25 @@ internal ApiUrls(string[] routes)
 			if (Routes == null) _fixedUrl = routes[0];
 		}
 
-
 		public string Resolve(RouteValues routeValues, IConnectionSettingsValues settings)
 		{
 			if (_fixedUrl != null) return _fixedUrl;
 
 			var resolved = routeValues.Resolve(settings);
-			
+
 			if (!Routes.TryGetValue(resolved.Count, out var routes))
-				throw new Exception($"No route taking {resolved.Count} parameters" + _errorMessageSuffix);
+				throw new Exception($"No route taking {resolved.Count} parameters{_errorMessageSuffix}");
 
 			if (routes.Count == 1)
-				return routes[0].ToUrl(resolved, settings);
+				return routes[0].ToUrl(resolved);
 
 			//find the first url that has all provided parameters
 			foreach (var u in routes)
 			{
-				if (u.Predicate(resolved))
-					return u.ToUrl(resolved, settings);
+				if (u.Matches(resolved))
+					return u.ToUrl(resolved);
 			}
-			throw new Exception($"No route taking {routeValues.Count} parameters" + _errorMessageSuffix);
+			throw new Exception($"No route taking {routeValues.Count} parameters{_errorMessageSuffix}");
 		}
 	}
 }

src/Nest/CommonAbstractions/Request/UrlLookup.cs

@@ -2,51 +2,62 @@
 using System.Linq;
 using System.Text;
 
-namespace Nest {
+namespace Nest
+{
 	internal class UrlLookup
 	{
-		private UrlLookup(Func<ResolvedRouteValues, bool> lookup, Func<ResolvedRouteValues, IConnectionSettingsValues, string> toString) =>
-			(Predicate, ToUrl) = (lookup, toString);
+		private readonly string[] _parts;
+		private readonly string _route;
+		private readonly string[] _tokenized;
+		private readonly int _length;
 
-		public Func<ResolvedRouteValues, bool> Predicate { get; set; }
-		public Func<ResolvedRouteValues, IConnectionSettingsValues, string> ToUrl { get; set; }
-		
-		public static UrlLookup FromRoute(string route)
+		public UrlLookup(string route)
 		{
-			var tokenized = route.Replace("{", "{@")
+			_route = route;
+			_tokenized = route.Replace("{", "{@")
 				.Split(new[] { '{', '}' }, StringSplitOptions.RemoveEmptyEntries);
 
-			var parts = tokenized
+			_parts = _tokenized
 				.Where(p => p.StartsWith("@"))
 				.Select(p => p.Remove(0, 1))
 				.ToArray();
 
-			Func<ResolvedRouteValues, bool> lookup;
-			Func<ResolvedRouteValues, IConnectionSettingsValues, string> toString;
-			lookup = r => parts.All(p => r.ContainsKey(p));
-			toString = (r ,s) =>
+			_length = _route.Length + (_parts.Length * 4);
+		}
+
+		public bool Matches(ResolvedRouteValues values)
+		{
+			for (var i = 0; i < _parts.Length; i++)
 			{
-				var sb = new StringBuilder();
-				var i = 0;
-				foreach (var t in tokenized)
+				if (!values.ContainsKey(_parts[i]))
+					return false;
+			}
+			return true;
+		}
+
+		public string ToUrl(ResolvedRouteValues values)
+		{
+			var sb = new StringBuilder(_length);
+			int i = 0;
+			for (var index = 0; index < _tokenized.Length; index++)
+			{
+				var t = _tokenized[index];
+				if (t[0] == '@')
 				{
-					if (t[0] == '@')
+					if (values.TryGetValue(_parts[i], out var v))
 					{
-						if (r.TryGetValue(parts[i], out var v))
-						{
-							if (string.IsNullOrEmpty(v))
-								throw new Exception($"'{parts[i]}' defined but is empty on url: {route}");
-							sb.Append(Uri.EscapeDataString(v));
-						}
-						else throw new Exception($"No value provided for '{parts[i]}' on url: {route}");
-
-						i++;
+						if (string.IsNullOrEmpty(v))
+							throw new Exception($"'{_parts[i]}' defined but is empty on url: {_route}");
+
+						sb.Append(Uri.EscapeDataString(v));
 					}
-					else sb.Append(t);
+					else throw new Exception($"No value provided for '{_parts[i]}' on url: {_route}");
+
+					i++;
 				}
-				return sb.ToString();
-			};
-			return new UrlLookup(lookup, toString);
+				else sb.Append(t);
+			}
+			return sb.ToString();
 		}
 	}
-}
+}