Merge remote-tracking branch 'origin/master'

Author: Moran

src/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs

@@ -22,14 +22,15 @@ public void SearchTypeScan()
 			Assert.True(scanResults.IsValid);
 			Assert.False(scanResults.Documents.Any());
 			Assert.IsNotNullOrEmpty(scanResults.ScrollId);
+
 			var scrolls = 1;
-			var results = this._client.Scroll("4s", scanResults.ScrollId);
+			var results = this._client.Scroll<ElasticSearchProject>("4s", scanResults.ScrollId);
 			while (results.Documents.Any())
 			{ 
 				Assert.True(results.IsValid);
 				Assert.True(results.Documents.Any());
 				Assert.IsNotNullOrEmpty(results.ScrollId);
-				results = this._client.Scroll("4s", results.ScrollId);
+				results = this._client.Scroll<ElasticSearchProject>("4s", results.ScrollId);
 				scrolls++;
 			}
 			Assert.AreEqual(5, scrolls);

src/Nest/ElasticClient-Scroll.cs

@@ -11,17 +11,22 @@ public partial class ElasticClient
 		/// </summary>
 		public IQueryResponse<dynamic> Scroll(string scrollTime, string scrollId)
 		{
-			scrollId.ThrowIfNullOrEmpty("scrollId");
-			scrollTime.ThrowIfNullOrEmpty("scrollTime");
-
-			scrollId = Uri.EscapeDataString(scrollId);
-			scrollTime = Uri.EscapeDataString(scrollTime);
-
-			var path = "_search/scroll?scroll={0}&scroll_id={1}".F(scrollTime, scrollId);
-
-			ConnectionStatus status = this.Connection.GetSync(path);
-			var r = this.ToParsedResponse<QueryResponse<dynamic>>(status);
-			return r;
+			return Scroll<dynamic>(scrollTime, scrollId);
+		}
+
+		public IQueryResponse<T> Scroll<T>(string scrollTime, string scrollId) where T : class
+		{
+			scrollId.ThrowIfNullOrEmpty("scrollId");
+			scrollTime.ThrowIfNullOrEmpty("scrollTime");
+
+			scrollId = Uri.EscapeDataString(scrollId);
+			scrollTime = Uri.EscapeDataString(scrollTime);
+
+			var path = "_search/scroll?scroll={0}&scroll_id={1}".F(scrollTime, scrollId);
+
+			ConnectionStatus status = this.Connection.GetSync(path);
+			var r = this.ToParsedResponse<QueryResponse<T>>(status);
+			return r;
 		}
 	}
 }