Merge branch 'master' of github.com:elastic/elasticsearch-net

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiUrl.cs

@@ -6,9 +6,9 @@ namespace CodeGeneration.LowLevelClient.Domain
 	// ReSharper disable once ClassNeverInstantiated.Global
 	public class ApiUrl
 	{
-		//these are aliases we much rather pass along inside the querystring
+		//these are aliases we much rather pass along inside the querystring (or body)
 		//allowing these will cause too many overloads being generated which helps noone
-		public static readonly string[] BlackListRouteValues = { "{search_groups}", "{indexing_types}", "{body}"};
+		public static readonly string[] BlackListRouteValues = { "{search_groups}", "{indexing_types}", "{body}", "{scroll_id}" };
 		private IEnumerable<string> _paths;
 
 		public string Path { get; set; }

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

@@ -59,16 +59,20 @@ public static CsharpMethod Clone(CsharpMethod method)
 			};
 		}
 
-		private bool IsPartless => this.Url.Parts == null || !this.Url.Parts.Any();
-
 		private string MetricPrefix => this.RequestType.Replace("Request", "");
 		private string ClrParamType(string clrType) => clrType.EndsWith("Metrics", StringComparison.OrdinalIgnoreCase)
 			? this.MetricPrefix + clrType.Replace("Metrics", "Metric") : clrType;
 
 		public IEnumerable<Constructor> RequestConstructors()
 		{
 			var ctors = new List<Constructor>();
+
 			if (IsPartless) return ctors;
+
+			// Do not generate ctors for scroll apis
+			// Scroll ids should always be passed as part of the request body and enforced via manual ctors
+			if (IsScroll) return ctors;
+
 			var m = this.RequestType;
 			foreach (var url in this.Url.Paths)
 			{
@@ -272,6 +276,9 @@ public IEnumerable<FluentRouteSetter> GetFluentRouteSetters()
 			return setters;
 		}
 
+
+		private bool IsPartless => this.Url.Parts == null || !this.Url.Parts.Any();
+		private bool IsScroll => this.Url.Parts.All(p => p.Key == "scroll_id");
 		public bool IndicesAndTypes => AllParts.Count() == 2 && AllParts.All(p => p.Type == "list") && AllParts.All(p => new[] { "index", "type" }.Contains(p.Name));
 		public bool IsDocumentPath => AllParts.Count() == 3 && AllParts.All(p => p.Type != "list") && AllParts.All(p => new[] { "index", "type", "id" }.Contains(p.Name));
 		public IEnumerable<ApiUrlPart> AllParts => (this.Url?.Parts?.Values ?? Enumerable.Empty<ApiUrlPart>()).Where(p => !string.IsNullOrWhiteSpace(p.Name));

src/Elasticsearch.Net/ElasticsearchClient.Generated.cs

@@ -837,36 +837,6 @@ public ElasticsearchResponse<T> CatThreadPool<T>(Func<CatThreadPoolRequestParame
 		public Task<ElasticsearchResponse<T>> CatThreadPoolAsync<T>(Func<CatThreadPoolRequestParameters, CatThreadPoolRequestParameters> requestParameters = null)
 			where T : class => this.DoRequestAsync<T>(GET, Url($"_cat/thread_pool"), null, _params(requestParameters, contentType: "text/plain"));
 
-		///<summary>Represents a DELETE on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">A comma-separated list of scroll IDs to clear</param>
-		///<param name="body">A comma-separated list of scroll IDs to clear if none was specified via the scroll_id parameter</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> ClearScroll<T>(string scroll_id, PostData<object> body, Func<ClearScrollRequestParameters, ClearScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequest<T>(DELETE, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), body, _params(requestParameters));
-		
-		///<summary>Represents a DELETE on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">A comma-separated list of scroll IDs to clear</param>
-		///<param name="body">A comma-separated list of scroll IDs to clear if none was specified via the scroll_id parameter</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> ClearScrollAsync<T>(string scroll_id, PostData<object> body, Func<ClearScrollRequestParameters, ClearScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequestAsync<T>(DELETE, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), body, _params(requestParameters));
-		
 		///<summary>Represents a DELETE on /_search/scroll 
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
 		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
@@ -6553,34 +6523,6 @@ public ElasticsearchResponse<T> ScrollGet<T>(Func<ScrollRequestParameters, Scrol
 		public Task<ElasticsearchResponse<T>> ScrollGetAsync<T>(Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
 			where T : class => this.DoRequestAsync<T>(GET, Url($"_search/scroll"), null, _params(requestParameters));
 
-		///<summary>Represents a GET on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">The scroll ID</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> ScrollGet<T>(string scroll_id, Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequest<T>(GET, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), null, _params(requestParameters));
-		
-		///<summary>Represents a GET on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">The scroll ID</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> ScrollGetAsync<T>(string scroll_id, Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequestAsync<T>(GET, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), null, _params(requestParameters));
-		
 		///<summary>Represents a POST on /_search/scroll 
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
 		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
@@ -6609,36 +6551,6 @@ public ElasticsearchResponse<T> Scroll<T>(PostData<object> body, Func<ScrollRequ
 		public Task<ElasticsearchResponse<T>> ScrollAsync<T>(PostData<object> body, Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
 			where T : class => this.DoRequestAsync<T>(POST, Url($"_search/scroll"), body, _params(requestParameters));
 
-		///<summary>Represents a POST on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">The scroll ID</param>
-		///<param name="body">The scroll ID if not passed by URL or query parameter.</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public ElasticsearchResponse<T> Scroll<T>(string scroll_id, PostData<object> body, Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequest<T>(POST, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), body, _params(requestParameters));
-		
-		///<summary>Represents a POST on /_search/scroll/{scroll_id} 
-		///<para></para>Returns: A task of ElasticsearchResponse&lt;T&gt; where the behaviour depends on the type of T:
-		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>
-		///<para> - byte[], no deserialization, but the response stream will be closed</para>
-		///<para> - Stream, no deserialization, response stream is your responsibility</para>
-		///<para> - VoidResponse, no deserialization, response stream never read and closed</para>
-		///<para> - DynamicDictionary, a dynamic aware dictionary that can be safely traversed to any depth 
-	    ///<para>See also: http://www.elastic.co/guide/en/elasticsearch/reference/2.0/search-request-scroll.html</para>	
-	    ///</summary>
-		///<param name="scroll_id">The scroll ID</param>
-		///<param name="body">The scroll ID if not passed by URL or query parameter.</param>
-		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
-		public Task<ElasticsearchResponse<T>> ScrollAsync<T>(string scroll_id, PostData<object> body, Func<ScrollRequestParameters, ScrollRequestParameters> requestParameters = null)
-			where T : class => this.DoRequestAsync<T>(POST, Url($"_search/scroll/{scroll_id.NotNull("scroll_id")}"), body, _params(requestParameters));
-		
 		///<summary>Represents a GET on /_search 
 		///<para></para>Returns: ElasticsearchResponse&lt;T&gt; where the behavior depends on the type of T:
 		///<para> - T, an object you own that the elasticsearch response will be deserialized to /para>