Skip to content

Fix reference issue where paramname is referred instead of basename #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 6, 2022
Merged

Fix reference issue where paramname is referred instead of basename #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d229d9c
Fix reference issue where paramname is referred instead of basename
AsabuHere Dec 2, 2022
a614820
Adding extra parameter to request body for the new fix validation
AsabuHere Dec 2, 2022
8b715e4
Fixing basename reference issues
AsabuHere Dec 2, 2022
02cf678
Fixing basename reference issues
AsabuHere Dec 2, 2022
8071ac1
test case fixes
AsabuHere Dec 2, 2022
d2ae1f8
changing param name to basename in map and array params as per revie…
AsabuHere Dec 5, 2022
e0f6f46
changing param name to basename in map and array params as per revie…
AsabuHere Dec 6, 2022
b6f7335
Merge branch 'main' into csharp_fixparams_reference
AsabuHere Dec 6, 2022
4dc4cfb
fixing basename references
AsabuHere Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/csharp/src/Twilio/Rest/Api/V2010/AccountOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ public override List<KeyValuePair<string, string>> GetParams()
}
if (DateTest != null)
{
p.Add(new KeyValuePair<string, string>("DateTest", DateTest.Value.ToString("yyyy-MM-dd")));
p.Add(new KeyValuePair<string, string>("Date.Test", DateTest.Value.ToString("yyyy-MM-dd")));
}
if (DateCreatedBefore != null)
{
p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
p.Add(new KeyValuePair<string, string>("DateCreated<", Serializers.DateTimeIso8601(DateCreatedBefore)));
}
if (DateCreatedAfter != null)
{
p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
p.Add(new KeyValuePair<string, string>("DateCreated>", Serializers.DateTimeIso8601(DateCreatedAfter)));
}
if (PageSize != null)
{
Expand Down
12 changes: 6 additions & 6 deletions examples/csharp/unit-test/Rest/TwilioRestTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ public void TestShouldSupportNestedPropertiesResponse()
var list = new List<KeyValuePair<string, string>>();
list.Add(new KeyValuePair<string, string>("DateCreated<",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateCreated>",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateTest", formattedDate));
list.Add(new KeyValuePair<string, string>("DateCreatedBefore",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateCreatedAfter",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("Date.Test", formattedDate));
list.Add(new KeyValuePair<string, string>("DateCreated<",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateCreated>",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("PageSize", "4"));

var request1 = new Request(
Expand Down Expand Up @@ -367,7 +367,7 @@ public void TestShouldSupportArrayOfObjectResponse()
string formattedDateTime = Serializers.DateTimeIso8601(currentDateTime);
var list = new List<KeyValuePair<string, string>>();
list.Add(new KeyValuePair<string, string>("DateCreated",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateTest", formattedDate));
list.Add(new KeyValuePair<string, string>("Date.Test", formattedDate));
list.Add(new KeyValuePair<string, string>("PageSize", "4"));

var request1 = new Request(
Expand Down Expand Up @@ -417,7 +417,7 @@ public void TestShouldSupportDeserializationTypes()
string formattedDateTime = Serializers.DateTimeIso8601(currentDateTime);
var list = new List<KeyValuePair<string, string>>();
list.Add(new KeyValuePair<string, string>("DateCreated",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateTest", formattedDate));
list.Add(new KeyValuePair<string, string>("Date.Test", formattedDate));
list.Add(new KeyValuePair<string, string>("PageSize", "4"));

var request1 = new Request(
Expand Down Expand Up @@ -615,7 +615,7 @@ public async System.Threading.Tasks.Task TestShouldMakeValidAPICallAccountReadAs
string formattedDateTime = Serializers.DateTimeIso8601(currentDateTime);
var list = new List<KeyValuePair<string, string>>();
list.Add(new KeyValuePair<string, string>("DateCreated",formattedDateTime ));
list.Add(new KeyValuePair<string, string>("DateTest", formattedDate));
list.Add(new KeyValuePair<string, string>("Date.Test", formattedDate));
list.Add(new KeyValuePair<string, string>("PageSize", "4"));

var request1 = new Request(
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/twilio-csharp/options/GetParams.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
{{#isArray}}
if ({{paramName}} != null)
{
p.AddRange({{paramName}}.Select({{paramName}} => new KeyValuePair<string, string>("{{paramName}}", {{{vendorExtensions.x-param-to-string}}})));
p.AddRange({{paramName}}.Select({{paramName}} => new KeyValuePair<string, string>("{{{baseName}}}", {{{vendorExtensions.x-param-to-string}}})));
}
{{/isArray}}
{{^isArray}}
{{^isMap}}
if ({{paramName}} != null)
{
p.Add(new KeyValuePair<string, string>("{{paramName}}", {{{vendorExtensions.x-param-to-string}}}));
p.Add(new KeyValuePair<string, string>("{{{baseName}}}", {{{vendorExtensions.x-param-to-string}}}));
Copy link
Contributor

@sbansla sbansla Dec 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change needs to be done in case of map and array as well and Test by generating code.

}
{{/isMap}}
{{/isArray}}
{{#isMap}}
if ({{paramName}} != null)
{
p.AddRange(PrefixedCollapsibleMap.Serialize({{paramName}}, "{{{vendorExtensions.x-map-value}}}"));
p.AddRange(PrefixedCollapsibleMap.Serialize({{{baseName}}}, "{{{vendorExtensions.x-map-value}}}"));
}
{{/isMap}}
{{#vendorExtensions.x-before-or-after}}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/twilio-csharp/options/HeaderParams.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
{{#isArray}}
if ({{paramName}} != null)
{
p.AddRange({{paramName}}.Select({{paramName}} => new KeyValuePair<string, string>("{{baseName}}", {{{vendorExtensions.x-param-to-string}}})));
p.AddRange({{paramName}}.Select({{paramName}} => new KeyValuePair<string, string>("{{{baseName}}}", {{{vendorExtensions.x-param-to-string}}})));
}
{{/isArray}}
{{^isArray}}
if ({{paramName}} != null)
{
p.Add(new KeyValuePair<string, string>("{{baseName}}", {{{vendorExtensions.x-param-to-string}}}));
p.Add(new KeyValuePair<string, string>("{{{baseName}}}", {{{vendorExtensions.x-param-to-string}}}));
}
{{/isArray}}
{{/vendorExtensions.x-header-params}}
Expand Down