Allow API's to be renamed by using their rest-spec name

Author: Mpdreamz

src/CodeGeneration/ApiGenerator/ApiGenerator.cs

@@ -152,13 +152,15 @@ private static KeyValuePair<string, ApiEndpoint> CreateApiEndpoint(string jsonFi
 			{
 				var replaceSpec = JObject.Parse(File.ReadAllText(replaceFile));
 				var endpointReplaced = replaceSpec.ToObject<Dictionary<string, ApiEndpoint>>().First();
+				endpointReplaced.Value.RestSpecName = endpointReplaced.Key;
 				endpointReplaced.Value.CsharpMethodName = CreateMethodName(endpointReplaced.Key);
 				return endpointReplaced;
 			}
 
 			var officialJsonSpec = JObject.Parse(File.ReadAllText(jsonFile));
 			PatchOfficialSpec(officialJsonSpec, jsonFile);
 			var endpoint = officialJsonSpec.ToObject<Dictionary<string, ApiEndpoint>>().First();
+			endpoint.Value.RestSpecName = endpoint.Key;
 			endpoint.Value.CsharpMethodName = CreateMethodName(endpoint.Key);
 			return endpoint;
 		}

src/CodeGeneration/ApiGenerator/CodeConfiguration.cs

@@ -35,6 +35,15 @@ private static string Root
 		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification\";
 		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
 
+		public static readonly Dictionary<string, string> ApiNameMapping =
+			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)
+				let contents = File.ReadAllText(f.FullName)
+				let c = Regex.Replace(contents, @"^.+\[MapsApi\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
+				where !c.Contains(" ") //filter results that did not match
+				select new { Value = f.Name.Replace("Request", ""), Key = c.Replace(".json", "") })
+				.DistinctBy(v => v.Key)
+				.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
+
 		public static readonly Dictionary<string, string> MethodNameOverrides =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)

src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs

@@ -58,6 +58,7 @@ public class ApiEndpoint
 	{
 		private List<CsharpMethod> _csharpMethods;
 
+		public string RestSpecName { get; set; }
 		public string CsharpMethodName { get; set; }
 		public string Documentation { get; set; }
 		public IEnumerable<string> Methods { get; set; }
@@ -221,10 +222,13 @@ public IEnumerable<CsharpMethod> CsharpMethods
 			}
 		}
 
+
 		private IEndpointOverrides GetOverrides()
 		{
 			var method = this.CsharpMethodName;
-			if (CodeConfiguration.MethodNameOverrides.TryGetValue(method, out var manualOverride))
+			if (CodeConfiguration.ApiNameMapping.TryGetValue(this.RestSpecName, out var mapsApiMethodName))
+				method = mapsApiMethodName;
+			else if (CodeConfiguration.MethodNameOverrides.TryGetValue(method, out var manualOverride))
 				method = manualOverride;
 
 			var typeName = "ApiGenerator.Overrides.Endpoints." + method + "Overrides";
@@ -293,7 +297,9 @@ public void PatchMethod(CsharpMethod method)
 			method = this.GetOverrides()?.PatchMethod(method) ?? method;
 
 			var key = method.QueryStringParamName.Replace("RequestParameters", "");
-			if (CodeConfiguration.MethodNameOverrides.TryGetValue(key, out var manualOverride))
+			if (CodeConfiguration.ApiNameMapping.TryGetValue(this.RestSpecName, out var mapsApiMethodName))
+				method.QueryStringParamName = mapsApiMethodName + "RequestParameters";
+			else if (CodeConfiguration.MethodNameOverrides.TryGetValue(key, out var manualOverride))
 				method.QueryStringParamName = manualOverride + "RequestParameters";
 
 			method.DescriptorType = method.QueryStringParamName.Replace("RequestParameters", "Descriptor");

src/Nest/CommonAbstractions/ForAttribute.cs

@@ -4,7 +4,7 @@ namespace Nest
 {
 	/// <summary>
 	/// DescriptorFor is a marker to rename unintuitive generated elasticsearch operation names
-	/// This is used by the code generator and is only meant for internal use to map our more aptly named requests to 
+	/// This is used by the code generator and is only meant for internal use to map our more aptly named requests to
 	/// the original elasticsearch rest spec
 	/// </summary>
 	[AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
@@ -15,4 +15,17 @@ internal class DescriptorForAttribute : Attribute
 		public DescriptorForAttribute (string operation) { }
 
 	}
+	/// <summary>
+	/// DescriptorFor is a marker to rename unintuitive generated elasticsearch operation names
+	/// This is used by the code generator and is only meant for internal use to map our more aptly named requests to
+	/// the original elasticsearch rest spec
+	/// </summary>
+	[AttributeUsage(System.AttributeTargets.Interface, AllowMultiple = false)]
+	internal class MapsApiAttribute : Attribute
+	{
+
+// ReSharper disable once UnusedParameter.Local
+		public MapsApiAttribute (string restSpecName) { }
+
+	}
 }