Skip to content

[csharp][generichost] Fix possible concatentation bug #23355

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
wing328 merged 1 commit into from
Mar 26, 2026
Merged

[csharp][generichost] Fix possible concatentation bug #23355

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: 2 additions & 0 deletions bin/configs/csharp-generichost-latest-dateTimeOffset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ additionalProperties:
modelPropertySorting: alphabetical
operationParameterSorting: alphabetical
useDateTimeOffset: true
treatWarningsAsErrors: true
warningsNotAsErrors: CS0612
2 changes: 1 addition & 1 deletion 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 @@ -388,7 +388,7 @@ namespace {{packageName}}.{{apiPackage}}
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "{{{path}}}"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "{{{path}}}");
{{/servers}}
{{#servers}}
{{#-first}}
Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public async Task<IHelloWorldPostApiResponse> HelloWorldPostAsync(Option<HelloWo
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/helloWorld"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/helloWorld");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/helloWorld");

if (helloWorldPostRequest.IsSet)
httpRequestMessageLocalVar.Content = (helloWorldPostRequest.Value as object) is System.IO.Stream stream
Expand Down
2 changes: 1 addition & 1 deletion ...petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public async Task<IIconsApiResponse> IconsAsync(Option<IconsSizeParameter> size
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/icons"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/icons");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/icons");

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

Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public async Task<IOneOfArrayApiResponse> OneOfArrayAsync(Option<OneOfArrayReque
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/one-of-array"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/one-of-array");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/one-of-array");

if (oneOfArrayRequest.IsSet)
httpRequestMessageLocalVar.Content = (oneOfArrayRequest.Value as object) is System.IO.Stream stream
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/api_keys/{id}"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/api_keys/{id}"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/api_keys/{id}"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
2 changes: 2 additions & 0 deletions ...nerichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>CS0612</WarningsNotAsErrors>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...re/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public async Task<ICall123TestSpecialTagsApiResponse> Call123TestSpecialTagsAsyn
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/another-fake/dummy"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy");

httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
Expand Down
12 changes: 6 additions & 6 deletions ...tstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ public async Task<IFooGetApiResponse> FooGetAsync(System.Threading.CancellationT
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/foo"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/foo");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down Expand Up @@ -764,7 +764,7 @@ public async Task<IGetCountryApiResponse> GetCountryAsync(string country, System
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/country"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/country");

List<KeyValuePair<string, string?>> formParameterLocalVars = new List<KeyValuePair<string, string?>>();

Expand Down Expand Up @@ -952,7 +952,7 @@ public async Task<IHelloApiResponse> HelloAsync(System.Threading.CancellationTok
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/hello"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/hello");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down Expand Up @@ -1170,7 +1170,7 @@ public async Task<IRedirectOrDefaultApiResponse> RedirectOrDefaultAsync(System.T
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/redirectOrDefault"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/redirectOrDefault");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/redirectOrDefault");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down Expand Up @@ -1394,7 +1394,7 @@ public async Task<IRolesReportGetApiResponse> RolesReportGetAsync(System.Threadi
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/roles/report"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/roles/report");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down Expand Up @@ -1612,7 +1612,7 @@ public async Task<ITestApiResponse> TestAsync(System.Threading.CancellationToken
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
? "/test"
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test");
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/test");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
Loading
Loading