Merge pull request #744 from elasticsearch/feature/normalize-enums

Feature/normalize enums

Author: gmarz

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -155,8 +155,25 @@ public static void PatchMethod(CsharpMethod method)
 				var overrides = Activator.CreateInstance(type) as IDescriptorOverrides;
 				if (overrides == null)
 					return;
-				method.Url.Params = method.Url.Params.Where(p => !overrides.SkipQueryStringParams.Contains(p.Key))
-					.ToDictionary(k => k.Key, v => v.Value);
+
+				foreach (var kv in method.Url.Params)
+				{
+					if (overrides.SkipQueryStringParams.Contains(kv.Key))
+						method.Url.Params.Remove(kv.Key);
+
+					if (overrides.RenameQueryStringParams == null) continue;
+					
+					string newName;
+					if (!overrides.RenameQueryStringParams.TryGetValue(kv.Key, out newName))
+						continue;
+
+					method.Url.Params.Remove(kv.Key);
+					method.Url.Params.Add(newName, kv.Value);
+					
+				}
+
+				//method.Url.Params = method.Url.Params.Where(p => !overrides.SkipQueryStringParams.Contains(p.Key))
+				//	.ToDictionary(k => k.Key, v => v.Value);
 			}
 // ReSharper disable once EmptyGeneralCatchClause
 			catch 

src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj

@@ -79,6 +79,8 @@
     <Compile Include="Domain\CsharpMethod.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Overrides\Allow404\ApiEndpointsThatAllow404.cs" />
+    <Compile Include="Overrides\Descriptors\IDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\NodesHotThreadsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\DeleteWarmerDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\PutTemplateDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ClearCacheDescriptorOverrides.cs" />

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiEndpoint.cs

@@ -123,7 +123,7 @@ public IEnumerable<CsharpMethod> CsharpMethods
 								case "list":
 									return "string " + p.Name;
 								case "enum":
-									return this.PascalCase(p.Name) + "Options " + p.Name;
+									return this.PascalCase(p.Name) + p.Name;
 								default:
 									return p.Type + " " + p.Name;
 									//return "string " + p.Name;

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiQueryParameters.cs

@@ -27,7 +27,7 @@ public string CsharpType(string paramName)
 				case null:
 					return "string";
 				case "enum":
-					return paramName.ToPascalCase() + "Options";
+					return paramName.ToPascalCase();
 				default:
 					return this.Type;
 			}

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/RestApiSpec.cs

@@ -24,7 +24,7 @@ public IEnumerable<EnumDescription> EnumsInTheSpec
 			get
 			{
 				var queryParamEnums = from m in this.CsharpMethodsWithQueryStringInfo.SelectMany(m => m.Url.Params)
-					where m.Value.CsharpType(m.Key).EndsWith("Options")
+					where m.Value.Type == "enum"
 					select new EnumDescription
 					{
 						Name = m.Value.CsharpType(m.Key),

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/ClearCacheDescriptorOverrides.cs

@@ -17,5 +17,7 @@ public IEnumerable<string> SkipQueryStringParams
 				};
 			}
 		}
+
+		public IDictionary<string, string> RenameQueryStringParams { get { return null; } }
 	}
 }

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/DeleteWarmerDescriptorOverrides.cs

@@ -17,5 +17,7 @@ public IEnumerable<string> SkipQueryStringParams
 				};
 			}
 		}
+
+		public IDictionary<string, string> RenameQueryStringParams { get { return null; } }
 	}
 }

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/IDescriptorOverrides.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+namespace CodeGeneration.LowLevelClient.Overrides.Descriptors
+{
+	/// <summary>
+	/// Tweaks the generated descriptors
+	/// </summary>
+	public interface IDescriptorOverrides
+	{
+		/// <summary>
+		/// Sometimes params can be defined on the body as well as on the querystring
+		/// We favor specifying params on the body so here we can specify params we don't want on the querystring.
+		/// </summary>
+		IEnumerable<string> SkipQueryStringParams { get; }
+
+		/// <summary>
+		/// Override how the query param name is exposed to the client.
+		/// </summary>
+		IDictionary<string, string> RenameQueryStringParams { get; } 
+	}
+}

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/MultiTermVectorsDescriptorOverrides.cs

@@ -18,5 +18,6 @@ public IEnumerable<string> SkipQueryStringParams
 				};
 			}
 		}
+		public IDictionary<string, string> RenameQueryStringParams { get { return null; } }
 	}
 }

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/NodesHotThreadsDescriptorOverrides.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CodeGeneration.LowLevelClient.Overrides.Descriptors
+{
+	public class NodesHotThreadsDescriptorOverrides : IDescriptorOverrides
+	{
+		public IEnumerable<string> SkipQueryStringParams
+		{
+			get
+			{
+				return new string[]
+				{
+					"fielddata"
+				};
+			}
+		}
+		public IDictionary<string, string> RenameQueryStringParams
+		{
+			get
+			{
+				return new Dictionary<string, string>
+				{
+					{ "type", "thread_type"}
+				};
+			}
+		}
+	}
+}