Feature/cluster put settings

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -144,6 +144,7 @@ public static void PatchMethod(CsharpMethod method)
 			string generic;
 			if (KnownDescriptors.TryGetValue(method.DescriptorType, out generic))
 				method.DescriptorTypeGeneric = generic;
+			else method.Unmapped = true;
 
 			try
 			{

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

@@ -17,6 +17,7 @@ public class CsharpMethod
 		public string Path { get; set; }
 		public string Arguments { get; set; }
 		public bool Allow404 { get; set; }
+		public bool Unmapped { get; set; }
 		public IEnumerable<ApiUrlPart> Parts { get; set; }
 		public ApiUrl Url { get; set; }
 	}

src/CodeGeneration/CodeGeneration.LowLevelClient/Views/_Descriptors.Generated.cshtml

@@ -24,10 +24,10 @@ namespace Nest
 	///@method.Documentation
 	///</pre>
 	///</summary>
-	public partial class @Raw(type)
+	public partial class @Raw(type) @(Raw(!method.Unmapped ? "" : string.Format(" : BaseRequest<{0}>", method.QueryStringParamName)))
 	{
-		internal @method.QueryStringParamName _QueryString = new @(method.QueryStringParamName)(); 
-</text>
+
+	</text>
 	  foreach (KeyValuePair<string, ApiQueryParameters> kv 
 				in method.Url.Params)
 	  {
@@ -42,7 +42,7 @@ namespace Nest
 		///<summary>@kv.Value.Description</summary>
 		public @Raw(type) @(mm)(@t @kv.Key@tSuffix)
 		{
-			this._QueryString.@(m)(@kv.Key);
+			this.Request.RequestParameters.@(m)(@kv.Key);
 			return this;
 		}
 		</text>
@@ -55,7 +55,7 @@ namespace Nest
 			if (!typedPathLookups.HasAny())
 				return this;
 
-			this._QueryString._@(mm)(typedPathLookups);
+			this.Request.RequestParameters._@(mm)(typedPathLookups);
 			return this;
 		}
 			</text>
@@ -68,14 +68,25 @@ namespace Nest
 		public @Raw(type) @mm@(Raw(typed ? "" : "<T>"))(@Raw("Expression<Func<T, object>>") typedPathLookup) @Raw(typed ? "" : "where T : class")
 		{
 			typedPathLookup.ThrowIfNull("typedPathLookup");
-			this._QueryString._@(mm)(typedPathLookup);
+			this.Request.RequestParameters._@(mm)(typedPathLookup);
 			return this;
 		}
 			</text>
 
 		 }
+
+
 	}
-	<text>	
+	if (method.Unmapped)
+	{
+		<text>
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, @Raw(string.Format("ElasticsearchPathInfo<{0}>", method.QueryStringParamName)) pathInfo)
+		{
+			throw new NotImplementedException();
+		}
+		</text>
+	}	
+	<text>
 	}
 	</text>
 }

src/Elasticsearch.Net/Connection/Transport.cs

@@ -258,6 +258,8 @@ public ElasticsearchResponse<T> DoRequest<T>(string method, string path, object
 				if (objectNeedsResponseRef != null)
 					objectNeedsResponseRef.RequestInformation = result;
 				tracer.SetResult(result);
+				if (this.Settings.ConnectionStatusHandler != null)
+					this.Settings.ConnectionStatusHandler(result);
 				return result;
 			}
 		}
@@ -369,6 +371,8 @@ public Task<ElasticsearchResponse<T>> DoRequestAsync<T>(string method, string pa
 						}
 
 						requestState.Tracer.SetResult(t.Result);
+						if (this.Settings.ConnectionStatusHandler != null)
+							this.Settings.ConnectionStatusHandler(t.Result);
 						return tcs.Task;
 					}).Unwrap();
 			}

src/Elasticsearch.Net/Domain/RequestParameters.Generated.cs

@@ -1138,12 +1138,12 @@ public ClusterPendingTasksRequestParameters MasterTimeout(string master_timeout)
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-update-settings.html
 	///</pre>
 	///</summary>
-	public class ClusterPutSettingsRequestParameters : FluentRequestParameters<ClusterPutSettingsRequestParameters> 
+	public class ClusterSettingsRequestParameters : FluentRequestParameters<ClusterSettingsRequestParameters> 
 	{
 
 		internal bool _flat_settings { get; set; }
 		///<summary>Return settings in flat format (default: false)</summary>
-		public ClusterPutSettingsRequestParameters FlatSettings(bool flat_settings)
+		public ClusterSettingsRequestParameters FlatSettings(bool flat_settings)
 		{
 			this._flat_settings = flat_settings;
 			this.AddQueryString("flat_settings", this._flat_settings);

src/Elasticsearch.Net/ElasticsearchClient.Generated.cs

@@ -4591,14 +4591,14 @@ public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPendingTasksAsync(F
 		///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
 		///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
 		///</returns>
-		public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
 		{
 			var url = "_cluster/settings".F();
 			BaseRequestParameters requestParams = null;
 
 			if (requestParameters != null)
 			{
-				requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
+				requestParams = requestParameters(new ClusterSettingsRequestParameters());
 				ToNameValueCollection(requestParams);
 			}
 
@@ -4625,14 +4625,14 @@ public ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterP
 		///<para> - If T is of type byte[] deserialization will be shortcircuited</para>
 		///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
 		///</returns>
-		public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
+		public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
 		{
 			var url = "_cluster/settings".F();
 			BaseRequestParameters requestParams = null;
 
 			if (requestParameters != null)
 			{
-				requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
+				requestParams = requestParameters(new ClusterSettingsRequestParameters());
 				ToNameValueCollection(requestParams);
 			}
 
@@ -4661,14 +4661,14 @@ public Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Fu
 		///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
 		///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
 		///</returns>
-		public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
+		public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
 		{
 			var url = "_cluster/settings".F();
 			BaseRequestParameters requestParams = null;
 
 			if (requestParameters != null)
 			{
-				requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
+				requestParams = requestParameters(new ClusterSettingsRequestParameters());
 				ToNameValueCollection(requestParams);
 			}
 
@@ -4697,14 +4697,14 @@ public ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body,
 		///<para> - i.e result.Response.hits.hits[0].property.nested["nested_deeper"]</para>
 		///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
 		///</returns>
-		public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null)
+		public Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null)
 		{
 			var url = "_cluster/settings".F();
 			BaseRequestParameters requestParams = null;
 
 			if (requestParameters != null)
 			{
-				requestParams = requestParameters(new ClusterPutSettingsRequestParameters());
+				requestParams = requestParameters(new ClusterSettingsRequestParameters());
 				ToNameValueCollection(requestParams);
 			}
 
@@ -23211,7 +23211,7 @@ public Task<ElasticsearchResponse<DynamicDictionary>> InfoAsync(Func<InfoRequest
 				requestParams = requestParameters(new InfoRequestParameters());
 				ToNameValueCollection(requestParams);
 			}
-				 
+
 
 
 			return ElasticsearchResponse.WrapAsync(this.DoRequestAsync<Dictionary<string, object>>(

src/Elasticsearch.Net/IElasticsearchClient.Generated.cs

@@ -2508,7 +2508,7 @@ public interface IElasticsearchClient
 		///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
 		///</returns>
 
-		ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
+		ElasticsearchResponse<T> ClusterPutSettings<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
 
 		///<summary>Represents a PUT on /_cluster/settings
 		///<para></para>Returns: A task that'll return an ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.
@@ -2526,7 +2526,7 @@ public interface IElasticsearchClient
 		///<para> - If T is of type VoidResponse the response stream will be ignored completely</para>
 		///</returns>
 
-		Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
+		Task<ElasticsearchResponse<T>> ClusterPutSettingsAsync<T>(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
 
 		///<summary>Represents a PUT on /_cluster/settings
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the response body deserialized as DynamicDictionary
@@ -2546,7 +2546,7 @@ public interface IElasticsearchClient
 		///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
 		///</returns>
 
-		ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
+		ElasticsearchResponse<DynamicDictionary> ClusterPutSettings(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
 
 		///<summary>Represents a PUT on /_cluster/settings
 		///<para></para>Returns: Task that'll return an ElasticsearchResponse&lt;T$gt; holding the response body deserialized as DynamicDictionary
@@ -2566,7 +2566,7 @@ public interface IElasticsearchClient
 		///<para> - can be safely dispatched to a nullable type even if intermediate properties do not exist</para>
 		///</returns>
 
-		Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterPutSettingsRequestParameters, ClusterPutSettingsRequestParameters> requestParameters = null);
+		Task<ElasticsearchResponse<DynamicDictionary>> ClusterPutSettingsAsync(object body, Func<ClusterSettingsRequestParameters, ClusterSettingsRequestParameters> requestParameters = null);
 
 		///<summary>Represents a POST on /_cluster/reroute
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; holding the reponse body deserialized as T.

src/Nest/DSL/AliasDescriptor.cs

@@ -13,8 +13,7 @@
 namespace Nest
 {
 	[DescriptorFor("IndicesUpdateAliases")]
-	public partial class AliasDescriptor : BasePathDescriptor<AliasDescriptor>,
-		 IPathInfo<AliasRequestParameters>
+	public partial class AliasDescriptor : BasePathDescriptor<AliasDescriptor, AliasRequestParameters>
 	{
 		public AliasDescriptor()
 		{
@@ -41,13 +40,11 @@ public AliasDescriptor Remove(Func<AliasRemoveDescriptor, AliasRemoveDescriptor>
 			return this;
 		}
 
-		ElasticsearchPathInfo<AliasRequestParameters> IPathInfo<AliasRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<AliasRequestParameters> pathInfo)
 		{
-			var pathInfo = new ElasticsearchPathInfo<AliasRequestParameters>();
-			pathInfo.RequestParameters = this._QueryString;
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
-
-			return pathInfo;
 		}
+
 	}
 }

src/Nest/DSL/AnalyzeDescriptor.cs

@@ -12,17 +12,11 @@
 namespace Nest
 {
 	[DescriptorFor("IndicesAnalyze")]
-	public partial class AnalyzeDescriptor : 
-		IndicesOptionalPathDescriptor<AnalyzeDescriptor, AnalyzeRequestParameters>
-		, IPathInfo<AnalyzeRequestParameters>
+	public partial class AnalyzeDescriptor : IndicesOptionalPathDescriptor<AnalyzeDescriptor, AnalyzeRequestParameters>
 	{
-
-		ElasticsearchPathInfo<AnalyzeRequestParameters> IPathInfo<AnalyzeRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<AnalyzeRequestParameters> pathInfo)
 		{
-			var pathInfo = base.ToPathInfo(settings, this._QueryString);
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
-
-			return pathInfo;
 		}
 	}
 }

src/Nest/DSL/BulkDescriptor.cs

@@ -14,9 +14,7 @@
 namespace Nest
 {
 
-	public partial class BulkDescriptor :
-		FixedIndexTypePathDescriptor<BulkDescriptor, BulkRequestParameters>
-		, IPathInfo<BulkRequestParameters>
+	public partial class BulkDescriptor : FixedIndexTypePathDescriptor<BulkDescriptor, BulkRequestParameters>
 	{
 		internal IList<BaseBulkOperation> _Operations = new SynchronizedCollection<BaseBulkOperation>();
 
@@ -128,11 +126,9 @@ public BulkDescriptor Update<T, K>(Func<BulkUpdateDescriptor<T, K>, BulkUpdateDe
 			return this;
 		}
 
-		ElasticsearchPathInfo<BulkRequestParameters> IPathInfo<BulkRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<BulkRequestParameters> pathInfo)
 		{
-			var pathInfo = this.ToPathInfo(settings, this._QueryString);
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
-			return pathInfo;
 		}
 	}
 }

src/Nest/DSL/ClearCacheDescriptor.cs

@@ -12,16 +12,12 @@
 namespace Nest
 {
 	[DescriptorFor("IndicesClearCache")]
-	public partial class ClearCacheDescriptor : 
-		IndicesOptionalPathDescriptor<ClearCacheDescriptor, ClearCacheRequestParameters>
-		, IPathInfo<ClearCacheRequestParameters>
+	public partial class ClearCacheDescriptor : IndicesOptionalPathDescriptor<ClearCacheDescriptor, ClearCacheRequestParameters>
 	{
-		ElasticsearchPathInfo<ClearCacheRequestParameters> IPathInfo<ClearCacheRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClearCacheRequestParameters> pathInfo)
 		{
-			var pathInfo = base.ToPathInfo(settings, this._QueryString);
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
-
-			return pathInfo;
 		}
 	}
 }

src/Nest/DSL/ClearScrollDescriptor.cs

@@ -13,8 +13,7 @@
 namespace Nest
 {
 	[DescriptorFor("ClearScroll")]
-	public partial class ClearScrollDescriptor : BasePathDescriptor<ClearScrollDescriptor>
-		, IPathInfo<ClearScrollRequestParameters>
+	public partial class ClearScrollDescriptor : BasePathDescriptor<ClearScrollDescriptor, ClearScrollRequestParameters>
 	{
 		internal string _ScrollId { get; set; }
 
@@ -27,17 +26,14 @@ public ClearScrollDescriptor ScrollId(string scrollId)
 			return this;
 		}
 
-		ElasticsearchPathInfo<ClearScrollRequestParameters> IPathInfo<ClearScrollRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClearScrollRequestParameters> pathInfo)
 		{
 			if (this._ScrollId.IsNullOrEmpty())
 				throw new DslException("missing ScrollId()");
 
-			var pathInfo = new ElasticsearchPathInfo<ClearScrollRequestParameters>();
-			pathInfo.RequestParameters = this._QueryString;
 			pathInfo.ScrollId = this._ScrollId;
 			pathInfo.HttpMethod = PathInfoHttpMethod.DELETE;
 
-			return pathInfo;
 		}
 	}
 }

src/Nest/DSL/CloseIndexDescriptor.cs

@@ -14,14 +14,10 @@ namespace Nest
 {
 	[DescriptorFor("IndicesClose")]
 	public partial class CloseIndexDescriptor : IndexPathDescriptorBase<CloseIndexDescriptor, CloseIndexRequestParameters>
-		, IPathInfo<CloseIndexRequestParameters>
 	{
-		ElasticsearchPathInfo<CloseIndexRequestParameters> IPathInfo<CloseIndexRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<CloseIndexRequestParameters> pathInfo)
 		{
-			var pathInfo = base.ToPathInfo(settings, this._QueryString);
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
-
-			return pathInfo;
 		}
 	}
 }