High level methods now take Time instead of TimeSpan

Closes #1713

Author: gmarz

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

@@ -37,5 +37,16 @@ public string CsharpType(string paramName)
 			}
 		}
 
+		public string HighLevelType(string paramName)
+		{
+			var csharpType = this.CsharpType(paramName);
+			switch (csharpType)
+			{
+				case "TimeSpan":
+					return "Time";
+				default:
+					return csharpType;
+			}
+		}
 	}
 }

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

@@ -42,11 +42,12 @@ namespace Nest
     }
 	</text>foreach (KeyValuePair<string, ApiQueryParameters> kv in method.Url.Params)
 	{
-            if (method.Url.Parts != null && method.Url.Parts.ContainsKey(kv.Key))
-            {
-				continue;
-            }
-		var t = @kv.Value.CsharpType(kv.Key);
+        if (method.Url.Parts != null && method.Url.Parts.ContainsKey(kv.Key))
+        {
+			continue;
+        }
+		var t = @kv.Value.HighLevelType(kv.Key);
+		var tMethod = t == "Time" ? ".ToTimeSpan()" : "";
 		var tSuffix = (t == "bool") ? " = true" : "";
 		var m = kv.Key.ToPascalCase();
 		var mm = (m != "Type" && m != "Index" && m != "Script") ? m : m + "QueryString";
@@ -60,7 +61,7 @@ namespace Nest
 		{<text>
 		[Obsolete("Scheduled to be removed in 2.0, use @kv.Value.DeprecatedInFavorOf instead")]
 		</text>}
-		public @Raw(type) @(mm)(@t @kv.Key@tSuffix) => AssignParam(p=>p.@(m)(@kv.Key));</text>
+		public @Raw(type) @(mm)(@t @kv.Key@tSuffix) => AssignParam(p=>p.@(m)(@kv.Key@tMethod));</text>
 		if (fieldMethod)
 		{
 			<text>

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

@@ -66,7 +66,7 @@ namespace Nest
 		var original = kv.Value.OriginalQueryStringParamName;
 		var cased = kv.Key.ToPascalCase();
 		var mm = (cased != "Type" && cased != "Index" && cased != "Script") ? cased : cased + "QueryString";
-		var fieldType = kv.Value.CsharpType(kv.Key).Replace("params", "");
+		var fieldType = kv.Value.HighLevelType(kv.Key).Replace("params", "");
 		var isFields = (original.Contains("fields") || original.Contains("source_include") || original.Contains("source_exclude"));
 		if (isFields && fieldType.Contains("string"))
 		{
@@ -76,12 +76,17 @@ namespace Nest
 		{
 			fieldType = "Field";
 		}
+		var setter = "value";
+		if (fieldType == "Time")
+		{
+			setter += ".ToTimeSpan()";
+		}
 		<text>///<summary>@kv.Value.Description</summary>
 		@if(!string.IsNullOrWhiteSpace(kv.Value.DeprecatedInFavorOf))
 		{
 		<text>[Obsolete("Scheduled to be removed in 2.0, use @kv.Value.DeprecatedInFavorOf instead")]</text>
 		}
-		public @Raw(fieldType) @(mm) { get { return Q@(Raw("<" + fieldType + ">"))("@original"); } set { Q("@original", value); } }
+		public @Raw(fieldType) @(mm) { get { return Q@(Raw("<" + fieldType + ">"))("@original"); } set { Q@(Raw("<" + fieldType + ">"))("@original", @setter); } }
 		</text>
 	}
 	@if (method.RequestTypeUnmapped)

src/Nest/CommonAbstractions/Request/RequestBase.cs

@@ -50,8 +50,7 @@ protected RequestBase(Func<RouteValues, RouteValues> pathSelector)
 
 		protected TOut Q<TOut>(string name) => RequestState.RequestParameters.GetQueryStringValue<TOut>(name);
 
-		protected void Q(string name, object value) => RequestState.RequestParameters.AddQueryStringValue(name, value);
-
+		protected void Q<TIn>(string name, TIn value) => RequestState.RequestParameters.AddQueryStringValue(name, value);
 	}
 
 	public abstract class RequestDescriptorBase<TDescriptor, TParameters, TInterface> : RequestBase<TParameters>, IDescriptor

src/Nest/CommonOptions/TimeUnit/Time.cs

@@ -120,8 +120,6 @@ public Time(string timeUnit)
 				Milliseconds = (long)this.Factor;
 		}
 
-		public TimeSpan ToTimeSpan() => TimeSpan.FromMilliseconds(this.Milliseconds);
-
 		public int CompareTo(Time other)
 		{
 			if (other == null) return 1;
@@ -142,6 +140,8 @@ public int CompareTo(Time other)
 		public static bool operator !=(Time left, Time right) =>
 			!object.ReferenceEquals(left, null) && !object.ReferenceEquals(right, null) && !left.Equals(right);
 
+		public TimeSpan ToTimeSpan() => TimeSpan.FromMilliseconds(this.Milliseconds);
+
 		public override string ToString()
 		{
 			if (this.Factor == null) return this.Milliseconds.ToString(CultureInfo.InvariantCulture);

src/Nest/Document/Multiple/Reindex/ReindexObservable.cs

@@ -60,7 +60,7 @@ private void Reindex(IObserver<IReindexResponse<T>> observer)
 					.Size(size)
 					.Query(q=>this._reindexRequest.Query)
 					.SearchType(SearchType.Scan)
-					.Scroll(scroll.ToTimeSpan())
+					.Scroll(scroll)
 				);
 			if (searchResult.Total <= 0)
 				throw new ElasticsearchClientException(PipelineFailure.BadResponse, $"Source index {fromIndex} doesn't contain any documents.", searchResult.ApiCall);

src/Nest/_Generated/_Descriptors.generated.cs

@@ -3,6 +3,7 @@
 using Tests.Framework;
 using Tests.Framework.MockData;
 using static Tests.Framework.UrlTester;
+using System;
 
 namespace Tests.Search.Search
 {
@@ -53,6 +54,13 @@ await POST("/_search")
 				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All)))
 				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest()))
 				;
+
+			await POST("/_search?scroll=1m")
+				.Fluent(c=>c.Search<Project>(s=>s.AllTypes().AllIndices().Scroll(TimeSpan.FromMinutes(1))))
+				.Request(c=>c.Search<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = new Time(1, TimeUnit.Minute) }))
+				.FluentAsync(c=>c.SearchAsync<Project>(s=>s.AllIndices().Type(Types.All).Scroll("1m")))
+				.RequestAsync(c=>c.SearchAsync<Project>(new SearchRequest<Project>(Nest.Indices.All, Types.All) { Scroll = 60000 } ))
+				;
 		}
 	}
 }

src/Nest/_Generated/_Requests.generated.cs

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running