Skip to content

[csharp][generichost] Fixed operation parameter handling #18322

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 1 commit into from
Apr 8, 2024
Merged

[csharp][generichost] Fixed operation parameter handling #18322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ using System.Runtime.CompilerServices;
/// <param name="obj">The parameter (header, path, query, form).</param>
/// <param name="format">The DateTime serialization format.</param>
/// <returns>Formatted string.</returns>
public static string{{nrt?}} ParameterToString(object obj, string{{nrt?}} format = ISO8601_DATETIME_FORMAT)
public static string{{nrt?}} ParameterToString(object{{nrt?}} obj, string{{nrt?}} format = ISO8601_DATETIME_FORMAT)
{
if (obj is DateTime dateTime)
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
Expand Down
7 changes: 3 additions & 4 deletions modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,7 @@ namespace {{packageName}}.{{apiPackage}}
{{#-first}}

{{/-first}}
{{/required}}
{{#required}}
parseQueryStringLocalVar["{{baseName}}"] = {{paramName}}{{#isNullable}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}{{/isNullable}}.ToString();
parseQueryStringLocalVar["{{baseName}}"] = ClientUtils.ParameterToString({{paramName}});
{{/required}}
{{/queryParams}}

Expand All @@ -438,7 +436,8 @@ namespace {{packageName}}.{{apiPackage}}
{{#queryParams}}
{{^required}}
if ({{paramName}}.IsSet)
parseQueryStringLocalVar["{{baseName}}"] = {{paramName}}.Value{{#isNullable}}{{nrt?}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}{{/isNullable}}.ToString();
// here too
parseQueryStringLocalVar["{{baseName}}"] = ClientUtils.ParameterToString({{paramName}}.Value);

{{/required}}
{{#-last}}
Expand Down
2 changes: 1 addition & 1 deletion .../client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static string SanitizeFilename(string filename)
/// <param name="obj">The parameter (header, path, query, form).</param>
/// <param name="format">The DateTime serialization format.</param>
/// <returns>Formatted string.</returns>
public static string? ParameterToString(object obj, string? format = ISO8601_DATETIME_FORMAT)
public static string? ParameterToString(object? obj, string? format = ISO8601_DATETIME_FORMAT)
{
if (obj is DateTime dateTime)
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
Expand Down
2 changes: 1 addition & 1 deletion .../client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static string SanitizeFilename(string filename)
/// <param name="obj">The parameter (header, path, query, form).</param>
/// <param name="format">The DateTime serialization format.</param>
/// <returns>Formatted string.</returns>
public static string? ParameterToString(object obj, string? format = ISO8601_DATETIME_FORMAT)
public static string? ParameterToString(object? obj, string? format = ISO8601_DATETIME_FORMAT)
{
if (obj is DateTime dateTime)
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
Expand Down
2 changes: 1 addition & 1 deletion ...etstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static string SanitizeFilename(string filename)
/// <param name="obj">The parameter (header, path, query, form).</param>
/// <param name="format">The DateTime serialization format.</param>
/// <returns>Formatted string.</returns>
public static string? ParameterToString(object obj, string? format = ISO8601_DATETIME_FORMAT)
public static string? ParameterToString(object? obj, string? format = ISO8601_DATETIME_FORMAT)
{
if (obj is DateTime dateTime)
// Return a formatted date string - Can be customized with Configuration.DateTimeFormat
Expand Down
46 changes: 27 additions & 19 deletions ...es/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@ public async Task<IFakeOuterStringSerializeApiResponse> FakeOuterStringSerialize

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["required_string_uuid"] = requiredStringUuid.ToString();
parseQueryStringLocalVar["required_string_uuid"] = ClientUtils.ParameterToString(requiredStringUuid);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -2974,7 +2974,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["query"] = query.ToString();
parseQueryStringLocalVar["query"] = ClientUtils.ParameterToString(query);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -3796,16 +3796,20 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

if (enumQueryStringArray.IsSet)
parseQueryStringLocalVar["enum_query_string_array"] = enumQueryStringArray.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);

if (enumQueryString.IsSet)
parseQueryStringLocalVar["enum_query_string"] = enumQueryString.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);

if (enumQueryDouble.IsSet)
parseQueryStringLocalVar["enum_query_double"] = enumQueryDouble.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);

if (enumQueryInteger.IsSet)
parseQueryStringLocalVar["enum_query_integer"] = enumQueryInteger.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -4037,14 +4041,16 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["required_string_group"] = requiredStringGroup.ToString();
parseQueryStringLocalVar["required_int64_group"] = requiredInt64Group.ToString();
parseQueryStringLocalVar["required_string_group"] = ClientUtils.ParameterToString(requiredStringGroup);
parseQueryStringLocalVar["required_int64_group"] = ClientUtils.ParameterToString(requiredInt64Group);

if (stringGroup.IsSet)
parseQueryStringLocalVar["string_group"] = stringGroup.Value.ToString();
// here too
parseQueryStringLocalVar["string_group"] = ClientUtils.ParameterToString(stringGroup.Value);

if (int64Group.IsSet)
parseQueryStringLocalVar["int64_group"] = int64Group.Value.ToString();
// here too
parseQueryStringLocalVar["int64_group"] = ClientUtils.ParameterToString(int64Group.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -4899,19 +4905,21 @@ public async Task<ITestQueryParameterCollectionFormatApiResponse> TestQueryParam

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["pipe"] = pipe.ToString();
parseQueryStringLocalVar["ioutil"] = ioutil.ToString();
parseQueryStringLocalVar["http"] = http.ToString();
parseQueryStringLocalVar["url"] = url.ToString();
parseQueryStringLocalVar["context"] = context.ToString();
parseQueryStringLocalVar["requiredNotNullable"] = requiredNotNullable.ToString();
parseQueryStringLocalVar["requiredNullable"] = requiredNullable.ToString();
parseQueryStringLocalVar["pipe"] = ClientUtils.ParameterToString(pipe);
parseQueryStringLocalVar["ioutil"] = ClientUtils.ParameterToString(ioutil);
parseQueryStringLocalVar["http"] = ClientUtils.ParameterToString(http);
parseQueryStringLocalVar["url"] = ClientUtils.ParameterToString(url);
parseQueryStringLocalVar["context"] = ClientUtils.ParameterToString(context);
parseQueryStringLocalVar["requiredNotNullable"] = ClientUtils.ParameterToString(requiredNotNullable);
parseQueryStringLocalVar["requiredNullable"] = ClientUtils.ParameterToString(requiredNullable);

if (notRequiredNotNullable.IsSet)
parseQueryStringLocalVar["notRequiredNotNullable"] = notRequiredNotNullable.Value.ToString();
// here too
parseQueryStringLocalVar["notRequiredNotNullable"] = ClientUtils.ParameterToString(notRequiredNotNullable.Value);

if (notRequiredNullable.IsSet)
parseQueryStringLocalVar["notRequiredNullable"] = notRequiredNullable.Value.ToString();
// here too
parseQueryStringLocalVar["notRequiredNullable"] = ClientUtils.ParameterToString(notRequiredNullable.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
4 changes: 2 additions & 2 deletions ...les/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ public async Task<IFindPetsByStatusApiResponse> FindPetsByStatusAsync(List<FindP

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["status"] = status.ToString();
parseQueryStringLocalVar["status"] = ClientUtils.ParameterToString(status);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -1424,7 +1424,7 @@ public async Task<IFindPetsByTagsApiResponse> FindPetsByTagsAsync(List<string> t

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["tags"] = tags.ToString();
parseQueryStringLocalVar["tags"] = ClientUtils.ParameterToString(tags);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
4 changes: 2 additions & 2 deletions ...es/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,8 +1745,8 @@ public async Task<ILoginUserApiResponse> LoginUserAsync(string username, string

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["username"] = username.ToString();
parseQueryStringLocalVar["password"] = password.ToString();
parseQueryStringLocalVar["username"] = ClientUtils.ParameterToString(username);
parseQueryStringLocalVar["password"] = ClientUtils.ParameterToString(password);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
46 changes: 27 additions & 19 deletions ...t/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ public async Task<IFakeOuterStringSerializeApiResponse> FakeOuterStringSerialize

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["required_string_uuid"] = requiredStringUuid.ToString();
parseQueryStringLocalVar["required_string_uuid"] = ClientUtils.ParameterToString(requiredStringUuid);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -2976,7 +2976,7 @@ public async Task<ITestBodyWithQueryParamsApiResponse> TestBodyWithQueryParamsAs

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["query"] = query.ToString();
parseQueryStringLocalVar["query"] = ClientUtils.ParameterToString(query);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -3810,16 +3810,20 @@ public async Task<ITestEnumParametersApiResponse> TestEnumParametersAsync(Option
System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

if (enumQueryStringArray.IsSet)
parseQueryStringLocalVar["enum_query_string_array"] = enumQueryStringArray.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_string_array"] = ClientUtils.ParameterToString(enumQueryStringArray.Value);

if (enumQueryDouble.IsSet)
parseQueryStringLocalVar["enum_query_double"] = enumQueryDouble.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_double"] = ClientUtils.ParameterToString(enumQueryDouble.Value);

if (enumQueryInteger.IsSet)
parseQueryStringLocalVar["enum_query_integer"] = enumQueryInteger.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_integer"] = ClientUtils.ParameterToString(enumQueryInteger.Value);

if (enumQueryString.IsSet)
parseQueryStringLocalVar["enum_query_string"] = enumQueryString.Value.ToString();
// here too
parseQueryStringLocalVar["enum_query_string"] = ClientUtils.ParameterToString(enumQueryString.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -4051,14 +4055,16 @@ public async Task<ITestGroupParametersApiResponse> TestGroupParametersAsync(bool

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["required_string_group"] = requiredStringGroup.ToString();
parseQueryStringLocalVar["required_int64_group"] = requiredInt64Group.ToString();
parseQueryStringLocalVar["required_string_group"] = ClientUtils.ParameterToString(requiredStringGroup);
parseQueryStringLocalVar["required_int64_group"] = ClientUtils.ParameterToString(requiredInt64Group);

if (stringGroup.IsSet)
parseQueryStringLocalVar["string_group"] = stringGroup.Value.ToString();
// here too
parseQueryStringLocalVar["string_group"] = ClientUtils.ParameterToString(stringGroup.Value);

if (int64Group.IsSet)
parseQueryStringLocalVar["int64_group"] = int64Group.Value.ToString();
// here too
parseQueryStringLocalVar["int64_group"] = ClientUtils.ParameterToString(int64Group.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -4913,19 +4919,21 @@ public async Task<ITestQueryParameterCollectionFormatApiResponse> TestQueryParam

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["pipe"] = pipe.ToString();
parseQueryStringLocalVar["ioutil"] = ioutil.ToString();
parseQueryStringLocalVar["http"] = http.ToString();
parseQueryStringLocalVar["url"] = url.ToString();
parseQueryStringLocalVar["context"] = context.ToString();
parseQueryStringLocalVar["requiredNotNullable"] = requiredNotNullable.ToString();
parseQueryStringLocalVar["requiredNullable"] = requiredNullable?.ToString();
parseQueryStringLocalVar["pipe"] = ClientUtils.ParameterToString(pipe);
parseQueryStringLocalVar["ioutil"] = ClientUtils.ParameterToString(ioutil);
parseQueryStringLocalVar["http"] = ClientUtils.ParameterToString(http);
parseQueryStringLocalVar["url"] = ClientUtils.ParameterToString(url);
parseQueryStringLocalVar["context"] = ClientUtils.ParameterToString(context);
parseQueryStringLocalVar["requiredNotNullable"] = ClientUtils.ParameterToString(requiredNotNullable);
parseQueryStringLocalVar["requiredNullable"] = ClientUtils.ParameterToString(requiredNullable);

if (notRequiredNotNullable.IsSet)
parseQueryStringLocalVar["notRequiredNotNullable"] = notRequiredNotNullable.Value.ToString();
// here too
parseQueryStringLocalVar["notRequiredNotNullable"] = ClientUtils.ParameterToString(notRequiredNotNullable.Value);

if (notRequiredNullable.IsSet)
parseQueryStringLocalVar["notRequiredNullable"] = notRequiredNullable.Value?.ToString();
// here too
parseQueryStringLocalVar["notRequiredNullable"] = ClientUtils.ParameterToString(notRequiredNullable.Value);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
4 changes: 2 additions & 2 deletions ...nt/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ public async Task<IFindPetsByStatusApiResponse> FindPetsByStatusAsync(List<strin

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["status"] = status.ToString();
parseQueryStringLocalVar["status"] = ClientUtils.ParameterToString(status);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down Expand Up @@ -1426,7 +1426,7 @@ public async Task<IFindPetsByTagsApiResponse> FindPetsByTagsAsync(List<string> t

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["tags"] = tags.ToString();
parseQueryStringLocalVar["tags"] = ClientUtils.ParameterToString(tags);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
4 changes: 2 additions & 2 deletions ...t/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,8 +1747,8 @@ public async Task<ILoginUserApiResponse> LoginUserAsync(string username, string

System.Collections.Specialized.NameValueCollection parseQueryStringLocalVar = System.Web.HttpUtility.ParseQueryString(string.Empty);

parseQueryStringLocalVar["username"] = username.ToString();
parseQueryStringLocalVar["password"] = password.ToString();
parseQueryStringLocalVar["username"] = ClientUtils.ParameterToString(username);
parseQueryStringLocalVar["password"] = ClientUtils.ParameterToString(password);

uriBuilderLocalVar.Query = parseQueryStringLocalVar.ToString();

Expand Down
Loading
Loading