Tidy up ApiGenerator

- Run generator to pull in v2.3.5 rest api specs
- Merge in changes pulled in from master, related to overrides on a per endpoint basis e.g. PatchMethod(), DescriptorOverridesBase
- Delete rest api specs pulled in from master e.g. xpack security

Author: russcam

src/CodeGeneration/ApiGenerator/ApiEndpoints/cluster.allocation_explain.json

@@ -14,9 +14,9 @@ public class ApiGenerator
 	{
 		static readonly RazorMachine RazorHelper = new RazorMachine();
 
-		public static void Generate(params string[] folders)
+		public static void Generate(string downloadBranch, params string[] folders)
 		{
-			var spec = CreateRestApiSpecModel(folders);
+			var spec = CreateRestApiSpecModel(downloadBranch, folders);
 			var actions = new Dictionary<Action<RestApiSpec>, string>
 			{
 				{  GenerateClientInterface, "Client interface" },
@@ -40,7 +40,7 @@ public static void Generate(params string[] folders)
 			}
 		}
 
-		private static RestApiSpec CreateRestApiSpecModel(string[] folders)
+		private static RestApiSpec CreateRestApiSpecModel(string downloadBranch, string[] folders)
 		{
 			var directories = Directory.GetDirectories(CodeConfiguration.RestSpecificationFolder, "*", SearchOption.AllDirectories)
 				.Where(f=>folders == null || folders.Length == 0 || folders.Contains(new DirectoryInfo(f).Name))
@@ -63,7 +63,7 @@ private static RestApiSpec CreateRestApiSpecModel(string[] folders)
 				}
 			}
 
-			return new RestApiSpec { Endpoints = endpoints };
+			return new RestApiSpec { Endpoints = endpoints, Commit = downloadBranch };
 		}
 
 

src/CodeGeneration/ApiGenerator/ApiEndpoints/ingest.delete_pipeline.json

@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Debug\</OutputPath>
+    <OutputPath>bin\Net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\CodeGeneration.LowLevelClient\bin\Net45\Release\</OutputPath>
+    <OutputPath>bin\Net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -62,13 +62,18 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="Overrides\Allow404\ApiEndpointsThatAllow404.cs" />
     <Compile Include="Overrides\Descriptors\ClearCacheDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\ClearCachedRealmsDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\ClearCachedRolesDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\DeleteWarmerDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\DescriptorOverridesBase.cs" />
     <Compile Include="Overrides\Descriptors\FieldStatsDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\GraphExploreDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\IDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\IndicesStatsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\MultiTermVectorsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\NodesHotThreadsDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\PutIndexTemplateDescriptorOverrides.cs" />
+    <Compile Include="Overrides\Descriptors\ReindexRethrottleDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ScrollDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\SearchDescriptorOverrides.cs" />
     <Compile Include="Overrides\Descriptors\ReindexOnServerDescriptorOverrides.cs" />
@@ -227,6 +232,7 @@
     <None Include="Views\_RequestParametersExtensions.Generated.cshtml" />
     <None Include="Views\_Requests.Generated.cshtml" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <UsingTask TaskName="CopyRuntimeDependencies" AssemblyFile="..\..\..\.paket\paket.exe" />
   <Target Name="AfterBuild" Condition="Exists('..\..\..\.paket\paket.exe')">

src/CodeGeneration/ApiGenerator/ApiEndpoints/ingest.get_pipeline.json

@@ -33,6 +33,7 @@ private static string Root
 		public static string EsNetFolder { get; } = $@"{Root}..\..\..\src\Elasticsearch.Net\";
 		public static string ViewFolder { get; } = $@"{Root}Views\";
 		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> MethodNameOverrides =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)

src/CodeGeneration/ApiGenerator/ApiEndpoints/ingest.put_pipeline.json

@@ -320,6 +320,8 @@ public static void PatchMethod(CsharpMethod method)
 					{
 						skipList = overrides.SkipQueryStringParams ?? skipList;
 						renameList = overrides.RenameQueryStringParams ?? renameList;
+
+						overrides.PatchMethod(method);
 					}
 				}