Merge branch 'develop' into feature/cat-apis

Conflicts:
	src/Nest/Nest.csproj

Author: gmarz

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -18,8 +18,8 @@ namespace CodeGeneration.LowLevelClient
 {
 	public static class ApiGenerator
 	{
-		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.2.0/rest-api-spec/api";
-		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.2.0/rest-api-spec/api/";
+		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.3.2/rest-api-spec/api";
+		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.3.2/rest-api-spec/api/";
 		private readonly static string _nestFolder = @"..\..\..\..\..\src\Nest\";
 		private readonly static string _esNetFolder = @"..\..\..\..\..\src\Elasticsearch.Net\";
 		private readonly static string _viewFolder = @"..\..\Views\";

src/CodeGeneration/CodeGeneration.YamlTestsRunner/Domain/TestSuite.cs

@@ -134,6 +134,8 @@ private static string PropertyPath(string value)
 				return "this._status";
 
 			value = Regex.Replace(value, @"\.(\d+)\.?", "[$1].");
+			//make sure we escape reserverd keywords
+			value = Regex.Replace(value, @"(^|\.)(class|params|default)(\.|$)", "$1@$2$3");
 			if (value.Length > 0)
 				value = "." + value;
 			if (Regex.IsMatch(value, @"([\s\-]|\\\.)"))

src/CodeGeneration/CodeGeneration.YamlTestsRunner/Extensions.cs

@@ -124,7 +124,7 @@ public static string SerializeToAnonymousObject(this object o, string indentatio
 				return "\t\t\t\t" + m.Value.Replace("  ", "\t");
 			}, RegexOptions.Multiline);
 			//escape c# keywords in the anon object
-			anon = anon.Replace("default=", "@default=").Replace("params=", "@params=");
+			anon = anon.Replace("default=", "@default=").Replace("params=", "@params=").Replace("class=", "@class=");
 			//docs contain different types of anon objects, quick fix by making them a dynamic[]
 			anon = anon.Replace("docs= new []", "docs= new dynamic[]");
 			//fix empty untyped arrays, default to string
@@ -145,6 +145,8 @@ public static string EscapeQuotes(this string s)
 
 		public static string SurroundWithQuotes(this string s)
 		{
+			if (Regex.IsMatch(s, @"^\d+(?:\.\d+)?$"))
+				return s;
 			return "@\"" + s.EscapeQuotes() + "\"";
 		}
 	}

src/CodeGeneration/CodeGeneration.YamlTestsRunner/YamlTestsGenerator.cs

@@ -25,8 +25,8 @@ namespace CodeGeneration.YamlTestsRunner
 	using YamlTestSuite = Dictionary<string, object>;
 	public static class YamlTestsGenerator
 	{
-		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.2.1/rest-api-spec/test";
-		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.2.1/rest-api-spec/test/";
+		private readonly static string _listingUrl = "https://github.com/elasticsearch/elasticsearch/tree/v1.3.2/rest-api-spec/test";
+		private readonly static string _rawUrlPrefix = "https://raw.github.com/elasticsearch/elasticsearch/v1.3.2/rest-api-spec/test/";
 		private readonly static string _testProjectFolder = @"..\..\..\..\..\src\Tests\Elasticsearch.Net.Integration.Yaml\";
 		private readonly static string _rawClientInterface = @"..\..\..\..\..\src\Elasticsearch.Net\IElasticsearchClient.generated.cs";
 		private readonly static string _viewFolder = @"..\..\Views\";
@@ -96,7 +96,8 @@ public static YamlSpecification GetYamlTestSpecification(bool useCache = false)
 			"index/60_refresh.yaml",
 			"create/60_refresh.yaml",
 			"update/60_refresh.yaml",
-			"search_shards/10_basic.yaml"
+			"search_shards/10_basic.yaml",
+			"template/10_basic.yaml"
 		};
 
 		private static IList<YamlDefinition> GetFolderFiles(string folder, bool useCache = false)

src/Nest/DSL/ClusterPendingTasksDescriptor.cs

@@ -0,0 +1,38 @@
+using Elasticsearch.Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	internal static class ClusterPendingTasksPathInfo
+	{
+		public static void Update(ElasticsearchPathInfo<ClusterPendingTasksRequestParameters> pathInfo)
+		{
+			pathInfo.HttpMethod = PathInfoHttpMethod.GET;
+		}
+	}
+
+	public interface IClusterPendingTasksRequest : IRequest<ClusterPendingTasksRequestParameters>
+	{
+	}
+
+	public partial class ClusterPendingTasksRequest 
+		: BasePathRequest<ClusterPendingTasksRequestParameters>, IClusterPendingTasksRequest
+	{
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClusterPendingTasksRequestParameters> pathInfo)
+		{
+			ClusterPendingTasksPathInfo.Update(pathInfo);
+		}
+	}
+
+	public partial class ClusterPendingTasksDescriptor 
+		: BasePathDescriptor<ClusterPendingTasksDescriptor, ClusterPendingTasksRequestParameters>, IClusterPendingTasksRequest
+	{
+		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClusterPendingTasksRequestParameters> pathInfo)
+		{
+			ClusterPendingTasksPathInfo.Update(pathInfo);
+		}
+	}
+}

src/Nest/DSL/_Descriptors.generated.cs

@@ -1007,7 +1007,7 @@ public ClusterHealthDescriptor WaitForStatus(WaitForStatus wait_for_status)
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-pending.html
 	///</pre>
 	///</summary>
-	public partial class ClusterPendingTasksDescriptor  : BaseRequest<ClusterPendingTasksRequestParameters>
+	public partial class ClusterPendingTasksDescriptor 
 	{
 
 
@@ -1027,12 +1027,6 @@ public ClusterPendingTasksDescriptor MasterTimeout(string master_timeout)
 			return this;
 		}
 
-		
-		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClusterPendingTasksRequestParameters> pathInfo)
-		{
-			throw new NotImplementedException();
-		}
-		
 
 	}
 

src/Nest/DSL/_Requests.generated.cs

@@ -941,7 +941,7 @@ public WaitForStatus WaitForStatus
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cluster-pending.html
 	///</pre>
 	///</summary>
-	public partial class ClusterPendingTasksRequest  : BasePathRequest<ClusterPendingTasksRequestParameters>
+	public partial class ClusterPendingTasksRequest 
 			{
 
 		///<summary>Return local information, do not retrieve the state from master node (default: false)</summary>
@@ -959,12 +959,6 @@ public string MasterTimeout
 			set { this.Request.RequestParameters.AddQueryString("master_timeout", value); }
 		}
 
-
-		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<ClusterPendingTasksRequestParameters> pathInfo)
-		{
-			throw new NotImplementedException();
-		}
-
 	}
 
 

src/Nest/Domain/Responses/ClusterPendingTasksResponse.cs

@@ -0,0 +1,39 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public interface IClusterPendingTasksResponse : IResponse
+	{
+		IEnumerable<PendingTask> Tasks { get; set; }
+	}
+
+	[JsonObject]
+	public class ClusterPendingTasksResponse : BaseResponse, IClusterPendingTasksResponse
+	{
+		[JsonProperty("tasks")]
+		public IEnumerable<PendingTask> Tasks { get; set; }
+	}
+
+	[JsonObject]
+	public class PendingTask
+	{
+		[JsonProperty("insert_order")]
+		public int InsertOrder { get; set; }
+
+		[JsonProperty("priority")]
+		public string Priority { get; set; }
+
+		[JsonProperty("source")]
+		public string Source { get; set; }
+
+		[JsonProperty("time_in_queue_millis")]
+		public int TimeInQueueMilliseconds { get; set; }
+
+		[JsonProperty("time_in_queue")]
+		public string TimeInQueue { get; set; }
+	}
+}

src/Nest/ElasticClient-ClusterPendingTasks.cs

@@ -0,0 +1,50 @@
+using Elasticsearch.Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	public partial class ElasticClient
+	{
+		/// <inheritdoc />
+		public IClusterPendingTasksResponse ClusterPendingTasks(Func<ClusterPendingTasksDescriptor, ClusterPendingTasksDescriptor> pendingTasksSelector = null)
+		{
+			pendingTasksSelector = pendingTasksSelector ?? (s => s);
+			return this.Dispatch<ClusterPendingTasksDescriptor, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse>(
+				pendingTasksSelector,
+				(p, d) => this.RawDispatch.ClusterPendingTasksDispatch<ClusterPendingTasksResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(Func<ClusterPendingTasksDescriptor, ClusterPendingTasksDescriptor> pendingTasksSelector = null)
+		{
+			pendingTasksSelector = pendingTasksSelector ?? (s => s);
+			return this.DispatchAsync<ClusterPendingTasksDescriptor, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse, IClusterPendingTasksResponse>(
+				pendingTasksSelector,
+				(p, d) => this.RawDispatch.ClusterPendingTasksDispatchAsync<ClusterPendingTasksResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public IClusterPendingTasksResponse ClusterPendingTasks(IClusterPendingTasksRequest pendingTasksRequest)
+		{
+			return this.Dispatch<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse>(
+				pendingTasksRequest,
+				(p, d) => this.RawDispatch.ClusterPendingTasksDispatch<ClusterPendingTasksResponse>(p)
+			);
+		}
+
+		/// <inheritdoc />
+		public Task<IClusterPendingTasksResponse> ClusterPendingTasksAsync(IClusterPendingTasksRequest pendingTasksRequest)
+		{
+			return this.DispatchAsync<IClusterPendingTasksRequest, ClusterPendingTasksRequestParameters, ClusterPendingTasksResponse, IClusterPendingTasksResponse>(
+				pendingTasksRequest,
+				(p, d) => this.RawDispatch.ClusterPendingTasksDispatchAsync<ClusterPendingTasksResponse>(p)
+			);
+		}
+	}
+}

src/Nest/Enums/IndexOptions.cs

@@ -12,6 +12,8 @@ public enum IndexOptions
 		[EnumMember(Value = "freqs")]
 		Freqs,
 		[EnumMember(Value = "positions")]
-		Positions
+		Positions,
+        [EnumMember(Value = "offsets")]
+        Offsets,
 	}
 }