Merge remote-tracking branch 'origin/feature/nodes-shutdown' into develop

Conflicts:
	src/Nest/Nest.csproj

Author: Mpdreamz

src/Nest/DSL/NodesShutdownDescriptor.cs

@@ -0,0 +1,40 @@
+using Elasticsearch.Net;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	internal static class NodesShutdownPathInfo
+	{
+		public static void Update(ElasticsearchPathInfo<NodesShutdownRequestParameters> pathInfo)
+		{
+			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
+		}
+	}
+
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	public interface INodesShutdownRequest : INodeIdOptionalPath<NodesShutdownRequestParameters>
+	{
+	}
+
+	public partial class NodesShutdownRequest 
+		: NodeIdOptionalPathBase<NodesShutdownRequestParameters>, INodesShutdownRequest
+	{
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<NodesShutdownRequestParameters> pathInfo)
+		{
+			NodesShutdownPathInfo.Update(pathInfo);
+		}
+	}
+
+	public partial class NodesShutdownDescriptor 
+		: NodeIdOptionalDescriptor<NodesShutdownDescriptor, NodesShutdownRequestParameters>, INodesShutdownRequest
+	{
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<NodesShutdownRequestParameters> pathInfo)
+		{
+			NodesShutdownPathInfo.Update(pathInfo);
+		}
+	}
+}

src/Nest/DSL/_Descriptors.generated.cs

@@ -4467,7 +4467,7 @@ public NodesInfoDescriptor Human(bool human = true)
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-nodes-shutdown.html
 	///</pre>
 	///</summary>
-	public partial class NodesShutdownDescriptor  : BaseRequest<NodesShutdownRequestParameters>
+	public partial class NodesShutdownDescriptor 
 	{
 
 
@@ -4487,12 +4487,6 @@ public NodesShutdownDescriptor Exit(bool exit = true)
 			return this;
 		}
 
-		
-		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<NodesShutdownRequestParameters> pathInfo)
-		{
-			throw new NotImplementedException();
-		}
-		
 
 	}
 

src/Nest/DSL/_Requests.generated.cs

@@ -4031,7 +4031,7 @@ public bool Human
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-nodes-shutdown.html
 	///</pre>
 	///</summary>
-	public partial class NodesShutdownRequest  : BasePathRequest<NodesShutdownRequestParameters>
+	public partial class NodesShutdownRequest 
 			{
 
 		///<summary>Set the delay for the operation (default: 1s)</summary>
@@ -4049,12 +4049,6 @@ public bool Exit
 			set { this.Request.RequestParameters.AddQueryString("exit", value); }
 		}
 
-
-		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<NodesShutdownRequestParameters> pathInfo)
-		{
-			throw new NotImplementedException();
-		}
-
 	}
 
 

src/Nest/Domain/Responses/NodesShutDownResponse.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+
+	public interface INodesShutdownResponse : IResponse
+	{
+		string ClusterName { get; set; }
+		Dictionary<string, Dictionary<string, string>> Nodes { get; set; }
+	}
+
+	[JsonObject]
+	public class NodesShutdownResponse : BaseResponse, INodesShutdownResponse
+	{
+		[JsonProperty("cluster_name")]
+		public string ClusterName { get; set; }
+
+		[JsonProperty("nodes")]
+		public Dictionary<string, Dictionary<string, string>> Nodes { get; set; }
+	}
+}

src/Nest/ElasticClient-Nodes.cs

@@ -1,15 +1,15 @@
-using System;
+using Elasticsearch.Net;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
-using Elasticsearch.Net;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace Nest
 {
 	using NodesHotThreadConverter = Func<IElasticsearchResponse, Stream, NodesHotThreadsResponse>;
-	using System.Text.RegularExpressions;
-	using System.Text;
 
 	public partial class ElasticClient
 	{
@@ -134,6 +134,44 @@ public Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsReque
 			);
 		}
 
+		/// <inheritdoc />
+		public INodesShutdownResponse NodesShutdown(Func<NodesShutdownDescriptor, NodesShutdownDescriptor> nodesShutdownSelector = null)
+		{
+			nodesShutdownSelector = nodesShutdownSelector ?? (s => s);
+			return this.Dispatch<NodesShutdownDescriptor, NodesShutdownRequestParameters, NodesShutdownResponse>(
+				nodesShutdownSelector,
+				(p, d) => this.RawDispatch.NodesShutdownDispatch<NodesShutdownResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public Task<INodesShutdownResponse> NodesShutdownAsync(Func<NodesShutdownDescriptor, NodesShutdownDescriptor> nodesShutdownSelector = null)
+		{
+			nodesShutdownSelector = nodesShutdownSelector ?? (s => s);
+			return this.DispatchAsync<NodesShutdownDescriptor, NodesShutdownRequestParameters, NodesShutdownResponse, INodesShutdownResponse>(
+				nodesShutdownSelector,
+				(p, d) => this.RawDispatch.NodesShutdownDispatchAsync<NodesShutdownResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public INodesShutdownResponse NodesShutdown(INodesShutdownRequest nodesShutdownRequest)
+		{
+			return this.Dispatch<INodesShutdownRequest, NodesShutdownRequestParameters, NodesShutdownResponse>(
+				nodesShutdownRequest,
+				(p, d) => this.RawDispatch.NodesShutdownDispatch<NodesShutdownResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public Task<INodesShutdownResponse> NodesShutdownAsync(INodesShutdownRequest nodesShutdownRequest)
+		{
+			return this.DispatchAsync<INodesShutdownRequest, NodesShutdownRequestParameters, NodesShutdownResponse, INodesShutdownResponse>(
+				nodesShutdownRequest,
+				(p, d) => this.RawDispatch.NodesShutdownDispatchAsync<NodesShutdownResponse>(p)
+			);
+		}
+
 		/// <summary>
 		/// Because the nodes.hot_threads endpoint returns plain text instead of JSON, we have to
 		/// manually parse the response text into a typed response object.

src/Nest/IElasticClient.cs

@@ -629,6 +629,22 @@ Task<IIndicesResponse> DeleteMappingAsync<T>(Func<DeleteMappingDescriptor<T>, De
 		/// <inheritdoc />
 		Task<INodesHotThreadsResponse> NodesHotThreadsAsync(INodesHotThreadsRequest nodesHotThreadsRequest);
 
+		/// <summary>
+		/// Allows to shutdown one or more (or all) nodes in the cluster.
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-nodes-shutdown.html#cluster-nodes-shutdown
+		/// </summary>
+		/// <param name="nodesShutdownSelector">A descriptor that describes the nodes shutdown operation</param>
+		INodesShutdownResponse NodesShutdown(Func<NodesShutdownDescriptor, NodesShutdownDescriptor> nodesShutdownSelector = null);
+
+		/// <inheritdoc />
+		Task<INodesShutdownResponse> NodesShutdownAsync(Func<NodesShutdownDescriptor, NodesShutdownDescriptor> nodesShutdownSelector = null);
+
+		/// <inheritdoc />
+		INodesShutdownResponse NodesShutdown(INodesShutdownRequest nodesShutdownRequest);
+
+		/// <inheritdoc />
+		Task<INodesShutdownResponse> NodesShutdownAsync(INodesShutdownRequest nodesShutdownRequest);
+
 		/// <summary>
 		/// Used to check if the index (indices) exists or not. 
 		/// <para> </para>http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-exists.html

src/Nest/Nest.csproj

@@ -181,6 +181,7 @@
     <Compile Include="DSL\ClusterStatsDescriptor.cs" />
     <Compile Include="DSL\TemplateExistsDescriptor.cs" />
     <Compile Include="Domain\Responses\PingResponse.cs" />
+    <Compile Include="Domain\Responses\NodesShutdownResponse.cs" />
     <Compile Include="DSL\Filter\GeoShapeCircleFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\GeoShapeMultiLineStringFilterDescriptor.cs" />
     <Compile Include="DSL\Filter\GeoShapeMultiPointFilterDescriptor.cs" />
@@ -194,6 +195,7 @@
     <Compile Include="DSL\MultiPercolate\IPercolateOperation.cs" />
     <Compile Include="DSL\MultiPercolateDescriptor.cs" />
     <Compile Include="DSL\NodesHotThreadsDescriptor.cs" />
+    <Compile Include="DSL\NodesShutdownDescriptor.cs" />
     <Compile Include="DSL\Paths\IndexOptionalNamePathDescriptor.cs" />
     <Compile Include="DSL\Paths\IndicesOptionalTypesNamePathDecriptor.cs" />
     <Compile Include="DSL\PingDescriptor.cs" />

src/Tests/Nest.Tests.Unit/Cluster/NodeTests.cs

@@ -59,5 +59,24 @@ public void NodeStatsSpecificNodeWithFlags()
 			url.AbsolutePath.Should().StartWith("/_nodes/127.0.0.1/stats/network%2Chttp");
 		}
 
+		[Test]
+		public void NodesShutdown()
+		{
+			var r = this._client.NodesShutdown();
+			var status = r.ConnectionStatus;
+			status.RequestUrl.Should().EndWith("/_shutdown");
+		}
+
+		[Test]
+		public void NodesShutdownSpecificNodeWithFlags()
+		{
+			var r = this._client.NodesShutdown(n => n
+				.NodeId("mynode")
+				.Delay("10s")
+				.Exit(false)
+			);
+			var status = r.ConnectionStatus;
+			status.RequestUrl.Should().EndWith("/_cluster/nodes/mynode/_shutdown?delay=10s&exit=false");
+		}
 	}
 }