Fix source query params for generated request extensions

gmarz · gmarz · commit ff207b830205 · 2014-08-07T16:43:42.000-04:00
This was fixed for RequestParameters.Generated.cs but was still an issue for RequestParametersExtensions.Generated.cs. Closes #858.
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Views/RequestParametersExtensions.Generated.cshtml b/src/CodeGeneration/CodeGeneration.LowLevelClient/Views/RequestParametersExtensions.Generated.cshtml
@@ -51,7 +51,7 @@ namespace Nest
 			where T : class
 		{
 			var _@(mm) = @mm@Raw(".Select(e=>(PropertyPathMarker)e)");
-			qs.AddQueryString("@mm", _@mm);
+			qs.AddQueryString("@kv.Value.OriginalQueryStringParamName", _@mm);
 			return qs;
 		}
 		</text>
diff --git a/src/Elasticsearch.Net/Domain/Enums.Generated.cs b/src/Elasticsearch.Net/Domain/Enums.Generated.cs
@@ -7,7 +7,7 @@
 
 ///This file contains all the typed enums that the client rest api spec exposes.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-///Generated of commit 
+///Generated of commit 154a5112f9
 namespace Elasticsearch.Net
 {
 	
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs
@@ -7,7 +7,7 @@
 
 //This file contains all the typed querystring parameters that are generated of the client spec.
 //This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-//Generated of commit 
+//Generated of commit 154a5112f9
 
 namespace Elasticsearch.Net
 {
diff --git a/src/Elasticsearch.Net/IElasticsearchClient.Generated.cs b/src/Elasticsearch.Net/IElasticsearchClient.Generated.cs
@@ -15,7 +15,7 @@ namespace Elasticsearch.Net
 	///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
 	///</pre>
 	///<pre>
-	///Generated of commit 
+	///Generated of commit 154a5112f9
 	///</pre>
 	///</summary>
 	public interface IElasticsearchClient
diff --git a/src/Nest/DSL/_Descriptors.generated.cs b/src/Nest/DSL/_Descriptors.generated.cs
@@ -7,7 +7,7 @@
 
 //This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.
 //This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-//Generated of commit 
+//Generated of commit 154a5112f9
 
 namespace Nest
 {
diff --git a/src/Nest/DSL/_Requests.generated.cs b/src/Nest/DSL/_Requests.generated.cs
@@ -8,7 +8,7 @@
 
 //This file contains all the typed querystring parameters that are generated of the client spec.
 //This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-//Generated of commit 
+//Generated of commit 154a5112f9
 
 namespace Nest
 {
diff --git a/src/Nest/Domain/RequestParametersExtensions.Generated.cs b/src/Nest/Domain/RequestParametersExtensions.Generated.cs
@@ -9,7 +9,7 @@
 
 ///This file contains all the typed request parameters that are generated of the client spec.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
-///Generated of commit 
+///Generated of commit 154a5112f9
 
 namespace Nest
 {
@@ -47,7 +47,7 @@ internal static ExplainRequestParameters _SourceExclude<T>(
 			where T : class
 		{
 			var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_exclude", _source_exclude);
+			qs.AddQueryString("_source_exclude", _source_exclude);
 			return qs;
 		}
 		
@@ -59,7 +59,7 @@ internal static ExplainRequestParameters _SourceInclude<T>(
 			where T : class
 		{
 			var _source_include = source_include.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_include", _source_include);
+			qs.AddQueryString("_source_include", _source_include);
 			return qs;
 		}
 		
@@ -83,7 +83,7 @@ internal static GetRequestParameters _SourceExclude<T>(
 			where T : class
 		{
 			var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_exclude", _source_exclude);
+			qs.AddQueryString("_source_exclude", _source_exclude);
 			return qs;
 		}
 		
@@ -95,7 +95,7 @@ internal static GetRequestParameters _SourceInclude<T>(
 			where T : class
 		{
 			var _source_include = source_include.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_include", _source_include);
+			qs.AddQueryString("_source_include", _source_include);
 			return qs;
 		}
 		
@@ -107,7 +107,7 @@ internal static SourceRequestParameters _SourceExclude<T>(
 			where T : class
 		{
 			var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_exclude", _source_exclude);
+			qs.AddQueryString("_source_exclude", _source_exclude);
 			return qs;
 		}
 		
@@ -119,7 +119,7 @@ internal static SourceRequestParameters _SourceInclude<T>(
 			where T : class
 		{
 			var _source_include = source_include.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_include", _source_include);
+			qs.AddQueryString("_source_include", _source_include);
 			return qs;
 		}
 		
@@ -204,7 +204,7 @@ internal static MultiGetRequestParameters _SourceExclude<T>(
 			where T : class
 		{
 			var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_exclude", _source_exclude);
+			qs.AddQueryString("_source_exclude", _source_exclude);
 			return qs;
 		}
 		
@@ -216,7 +216,7 @@ internal static MultiGetRequestParameters _SourceInclude<T>(
 			where T : class
 		{
 			var _source_include = source_include.Select(e=>(PropertyPathMarker)e);
-			qs.AddQueryString("source_include", _source_include);
+			qs.AddQueryString("_source_include", _source_include);
 			return qs;
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace Nest`
`51`	`51`	`where T : class`
`52`	`52`	`{`
`53`	`53`	`var _@(mm) = @mm@Raw(".Select(e=>(PropertyPathMarker)e)");`
`54`		`- qs.AddQueryString("@mm", _@mm);`
	`54`	`+ qs.AddQueryString("@kv.Value.OriginalQueryStringParamName", _@mm);`
`55`	`55`	`return qs;`
`56`	`56`	`}`
`57`	`57`	`</text>`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`///This file contains all the typed enums that the client rest api spec exposes.`
`9`	`9`	`///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`10`		`-///Generated of commit`
	`10`	`+///Generated of commit 154a5112f9`
`11`	`11`	`namespace Elasticsearch.Net`
`12`	`12`	`{`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`//This file contains all the typed querystring parameters that are generated of the client spec.`
`9`	`9`	`//This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`10`		`-//Generated of commit`
	`10`	`+//Generated of commit 154a5112f9`
`11`	`11`
`12`	`12`	`namespace Elasticsearch.Net`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`//This file lays the base for all the descriptors based on the query string parameters in the spec for IElasticClient.`
`9`	`9`	`//This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`10`		`-//Generated of commit`
	`10`	`+//Generated of commit 154a5112f9`
`11`	`11`
`12`	`12`	`namespace Nest`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`//This file contains all the typed querystring parameters that are generated of the client spec.`
`10`	`10`	`//This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`11`		`-//Generated of commit`
	`11`	`+//Generated of commit 154a5112f9`
`12`	`12`
`13`	`13`	`namespace Nest`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`///This file contains all the typed request parameters that are generated of the client spec.`
`11`	`11`	`///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec`
`12`		`-///Generated of commit`
	`12`	`+///Generated of commit 154a5112f9`
`13`	`13`
`14`	`14`	`namespace Nest`
`15`	`15`	`{`
`@@ -47,7 +47,7 @@ internal static ExplainRequestParameters _SourceExclude<T>(`
`47`	`47`	`where T : class`
`48`	`48`	`{`
`49`	`49`	`var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);`
`50`		`- qs.AddQueryString("source_exclude", _source_exclude);`
	`50`	`+ qs.AddQueryString("_source_exclude", _source_exclude);`
`51`	`51`	`return qs;`
`52`	`52`	`}`
`53`	`53`
`@@ -59,7 +59,7 @@ internal static ExplainRequestParameters _SourceInclude<T>(`
`59`	`59`	`where T : class`
`60`	`60`	`{`
`61`	`61`	`var _source_include = source_include.Select(e=>(PropertyPathMarker)e);`
`62`		`- qs.AddQueryString("source_include", _source_include);`
	`62`	`+ qs.AddQueryString("_source_include", _source_include);`
`63`	`63`	`return qs;`
`64`	`64`	`}`
`65`	`65`
`@@ -83,7 +83,7 @@ internal static GetRequestParameters _SourceExclude<T>(`
`83`	`83`	`where T : class`
`84`	`84`	`{`
`85`	`85`	`var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);`
`86`		`- qs.AddQueryString("source_exclude", _source_exclude);`
	`86`	`+ qs.AddQueryString("_source_exclude", _source_exclude);`
`87`	`87`	`return qs;`
`88`	`88`	`}`
`89`	`89`
`@@ -95,7 +95,7 @@ internal static GetRequestParameters _SourceInclude<T>(`
`95`	`95`	`where T : class`
`96`	`96`	`{`
`97`	`97`	`var _source_include = source_include.Select(e=>(PropertyPathMarker)e);`
`98`		`- qs.AddQueryString("source_include", _source_include);`
	`98`	`+ qs.AddQueryString("_source_include", _source_include);`
`99`	`99`	`return qs;`
`100`	`100`	`}`
`101`	`101`
`@@ -107,7 +107,7 @@ internal static SourceRequestParameters _SourceExclude<T>(`
`107`	`107`	`where T : class`
`108`	`108`	`{`
`109`	`109`	`var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);`
`110`		`- qs.AddQueryString("source_exclude", _source_exclude);`
	`110`	`+ qs.AddQueryString("_source_exclude", _source_exclude);`
`111`	`111`	`return qs;`
`112`	`112`	`}`
`113`	`113`
`@@ -119,7 +119,7 @@ internal static SourceRequestParameters _SourceInclude<T>(`
`119`	`119`	`where T : class`
`120`	`120`	`{`
`121`	`121`	`var _source_include = source_include.Select(e=>(PropertyPathMarker)e);`
`122`		`- qs.AddQueryString("source_include", _source_include);`
	`122`	`+ qs.AddQueryString("_source_include", _source_include);`
`123`	`123`	`return qs;`
`124`	`124`	`}`
`125`	`125`
`@@ -204,7 +204,7 @@ internal static MultiGetRequestParameters _SourceExclude<T>(`
`204`	`204`	`where T : class`
`205`	`205`	`{`
`206`	`206`	`var _source_exclude = source_exclude.Select(e=>(PropertyPathMarker)e);`
`207`		`- qs.AddQueryString("source_exclude", _source_exclude);`
	`207`	`+ qs.AddQueryString("_source_exclude", _source_exclude);`
`208`	`208`	`return qs;`
`209`	`209`	`}`
`210`	`210`
`@@ -216,7 +216,7 @@ internal static MultiGetRequestParameters _SourceInclude<T>(`
`216`	`216`	`where T : class`
`217`	`217`	`{`
`218`	`218`	`var _source_include = source_include.Select(e=>(PropertyPathMarker)e);`
`219`		`- qs.AddQueryString("source_include", _source_include);`
	`219`	`+ qs.AddQueryString("_source_include", _source_include);`
`220`	`220`	`return qs;`
`221`	`221`	`}`
`222`	`222`