Merge branch 'fix/master-5.0.0-alpha3'

Author: russcam

build/scripts/Paths.fsx

@@ -285,16 +285,19 @@ module Tooling =
 
     type DnxTooling(exe) =
         member this.Exec runtime failedF workingDirectory arguments =
+            this.ExecWithTimeout runtime failedF workingDirectory arguments (TimeSpan.FromMinutes 30.)
+
+        member this.ExecWithTimeout runtime failedF workingDirectory arguments timeout =
             match (runtime, hasClr, hasCoreClr) with
             | (Core, _, Some c) ->
                 let proc = c.Process exe
-                execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
+                execProcessWithTimeout proc arguments timeout
             | (Desktop, Some d, _) ->
                 let proc = d.Process exe
-                execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)
+                execProcessWithTimeout proc arguments timeout
             | (Both, Some d, Some c) ->
                 let proc = d.Process exe
-                let result = execProcess proc arguments 
+                let result = execProcessWithTimeout proc arguments timeout
                 if result <> 0 then failwith (sprintf "Failed to run dnx tooling for %s args: %A" proc arguments)
                 let proc = c.Process exe
                 execProcessWithTimeout proc arguments (TimeSpan.FromMinutes 30.)

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -19,9 +19,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" },
@@ -45,7 +45,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))
@@ -68,7 +68,7 @@ private static RestApiSpec CreateRestApiSpecModel(string[] folders)
 				}
 			}
 
-			return new RestApiSpec { Endpoints = endpoints };
+			return new RestApiSpec { Endpoints = endpoints, Commit = downloadBranch };
 		}
 
 

src/CodeGeneration/CodeGeneration.LowLevelClient/CodeConfiguration.cs

@@ -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/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj

@@ -62,12 +62,17 @@
     <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\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" />
@@ -96,6 +101,7 @@
     <None Include="RestSpecification\Core\cat.segments.json" />
     <None Include="RestSpecification\Core\cat.shards.json" />
     <None Include="RestSpecification\Core\cat.snapshots.json" />
+    <None Include="RestSpecification\Core\cat.tasks.json" />
     <None Include="RestSpecification\Core\cat.thread_pool.json" />
     <None Include="RestSpecification\Core\clear_scroll.json" />
     <None Include="RestSpecification\Core\cluster.allocation_explain.json" />
@@ -109,6 +115,7 @@
     <None Include="RestSpecification\Core\count.json" />
     <None Include="RestSpecification\Core\count_percolate.json" />
     <None Include="RestSpecification\Core\delete.json" />
+    <None Include="RestSpecification\Core\delete_by_query.json" />
     <None Include="RestSpecification\Core\delete_script.json" />
     <None Include="RestSpecification\Core\delete_template.json" />
     <None Include="RestSpecification\Core\exists.json" />
@@ -196,6 +203,16 @@
     <None Include="RestSpecification\XPack\License\license.delete.json" />
     <None Include="RestSpecification\XPack\License\license.get.json" />
     <None Include="RestSpecification\XPack\License\license.post.json" />
+    <None Include="RestSpecification\XPack\Security\security.change_password.json" />
+    <None Include="RestSpecification\XPack\Security\security.authenticate.json" />
+    <None Include="RestSpecification\XPack\Security\security.clear_cached_realms.json" />
+    <None Include="RestSpecification\XPack\Security\security.clear_cached_roles.json" />
+    <None Include="RestSpecification\XPack\Security\security.delete_role.json" />
+    <None Include="RestSpecification\XPack\Security\security.delete_user.json" />
+    <None Include="RestSpecification\XPack\Security\security.get_role.json" />
+    <None Include="RestSpecification\XPack\Security\security.get_user.json" />
+    <None Include="RestSpecification\XPack\Security\security.put_role.json" />
+    <None Include="RestSpecification\XPack\Security\security.put_user.json" />
     <None Include="RestSpecification\XPack\Shield\shield.authenticate.json" />
     <None Include="RestSpecification\XPack\Shield\shield.clear_cached_realms.json" />
     <None Include="RestSpecification\XPack\Shield\shield.clear_cached_roles.json" />

src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.project.lock.json

@@ -1,6 +1,6 @@
 {
   "locked": false,
-  "version": 1,
+  "version": 2,
   "targets": {
     ".NETFramework,Version=v4.5": {},
     ".NETFramework,Version=v4.5/win": {}

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

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

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

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace CodeGeneration.LowLevelClient.Domain
@@ -11,6 +12,12 @@ public class ApiQueryParameters
 		public string Description { get; set; }
 		public IEnumerable<string> Options { get; set; }
 
+		public ApiQueryParameters()
+		{
+			FluentGenerator = (queryStringParamName, mm, original, setter) =>
+				$"public {queryStringParamName} {mm.ToPascalCase()}({CsharpType(mm)} {mm}) => this.AddQueryString(\"{original}\", {setter});";
+		}
+
 		public string CsharpType(string paramName)
 		{
 			switch (this.Type)
@@ -50,5 +57,11 @@ public string HighLevelType(string paramName)
 					return csharpType;
 			}
 		}
+
+		public Func<string, string, string, string, string> Generator { get; set; } =
+			(fieldType, mm, original, setter) =>
+				$"public {fieldType} {mm} {{ get {{ return Q<{fieldType}>(\"{original}\"); }} set {{ Q(\"{original}\", {setter}); }} }}";
+
+		public Func<string, string, string, string, string> FluentGenerator { get; set; }
 	}
 }

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiUrlPart.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace CodeGeneration.LowLevelClient.Domain
 {
@@ -14,6 +15,8 @@ public string ClrTypeName
 		{
 			get
 			{
+				if (ClrTypeNameOverride != null) return ClrTypeNameOverride;
+
 				switch(this.Name)
 				{
 					case "index": return this.Type == "string" ? "IndexName" : "Indices";
@@ -41,6 +44,8 @@ public string ClrTypeName
 			}
 		}
 
+		public string ClrTypeNameOverride { get; set; }
+
 		public string InterfaceName
 		{
 			get

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/CsharpMethod.cs

@@ -116,7 +116,7 @@ public IEnumerable<Constructor> RequestConstructors()
 				var generated = $"public {m}({par}) : base({routing}){{}}";
 
 				// special case SearchRequest<T> to pass the type of T as the type, when only the index is specified.
-				if (m == "SearchRequest" && cp.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				if ((m == "SearchRequest") && cp.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
 				{
 					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
 					generated = $"public {m}({par}) : this({cp.First().Key}, typeof({generic})){{}}";
@@ -191,7 +191,17 @@ public IEnumerable<Constructor> DescriptorConstructors()
 				{
 					doc += "\r\n" + string.Join("\t\t\r\n", cp.Select(p => $"///<param name=\"{p.Key}\"> this parameter is required</param>"));
 				}
-				var c = new Constructor { Generated = $"public {m}({par}) : base({routing}){{}}", Description = doc };
+
+				var generated = $"public {m}({par}) : base({routing}){{}}";
+
+				// Add typeof(T) as the default type when only index specified
+				if ((m == "DeleteByQueryDescriptor" || m == "UpdateByQueryDescriptor") && cp.Count() == 1 && !string.IsNullOrEmpty(this.RequestTypeGeneric))
+				{
+					var generic = this.RequestTypeGeneric.Replace("<", "").Replace(">", "");
+					generated = $"public {m}({par}) : base({routing}.Required(\"type\", (Types)typeof({generic}))){{}}";
+				}
+
+				var c = new Constructor { Generated = generated, Description = doc };
 				ctors.Add(c);
 			}
 			if (IsDocumentPath && !string.IsNullOrEmpty(this.DescriptorTypeGeneric))

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

@@ -5,13 +5,11 @@
 namespace CodeGeneration.LowLevelClient.Overrides.Descriptors
 {
 	// ReSharper disable once UnusedMember.Global
-	public class ClearCacheDescriptorOverrides : IDescriptorOverrides
+	public class ClearCacheDescriptorOverrides : DescriptorOverridesBase
 	{
-		public IEnumerable<string> SkipQueryStringParams => new []
+		public override IEnumerable<string> SkipQueryStringParams => new []
 		{
 			"fielddata"
 		};
-
-		public IDictionary<string, string> RenameQueryStringParams => null;
 	}
 }