Skip to content

Commit fe48451

Browse files
committed
skip params also on requestparameters and prefer plural source_includes
1 parent 8e5114f commit fe48451

File tree

6 files changed

+76
-715
lines changed

6 files changed

+76
-715
lines changed

src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static SortedDictionary<string, QueryParameters> Patch(
4141
if (!renameLookup.TryGetValue(queryStringKey, out var preferredName)) preferredName = kv.Key;
4242
kv.Value.ClsName = CreateCSharpName(preferredName);
4343

44-
if (skipList.Contains(queryStringKey)) kv.Value.Skip = true;;
44+
if (skipList.Contains(queryStringKey)) kv.Value.Skip = true;
4545

4646
if (partialList.Contains(queryStringKey)) kv.Value.RenderPartial = true;
4747

src/CodeGeneration/ApiGenerator/Domain/Specification/ApiEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class ApiEndpoint
7070
{
7171
CsharpNames = CsharpNames,
7272
OfficialDocumentationLink = OfficialDocumentationLink,
73-
Params = Url.Params.Values.ToList(),
73+
Params = Url.Params.Values.Where(p=>!p.Skip).ToList(),
7474
HttpMethod = PreferredHttpMethod
7575
};
7676

src/CodeGeneration/ApiGenerator/Overrides/GlobalOverrides.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class GlobalOverrides : EndpointOverridesBase
2525
public override IDictionary<string, string> RenameQueryStringParams { get; } = new Dictionary<string, string>
2626
{
2727
{ "_source", "source_enabled" },
28-
{ "_source_includes", "source_include" },
29-
{ "_source_excludes", "source_exclude" },
28+
{ "_source_includes", "source_includes" },
29+
{ "_source_excludes", "source_excludes" },
3030
{ "rest_total_hits_as_int", "total_hits_as_integer" },
3131
{ "docvalue_fields", "doc_value_fields" },
3232
{ "q", "query_on_query_string" },

0 commit comments

Comments
 (0)