Skip to content

Commit 8dce5e5

Browse files
authored
fix possible concatentation bug (#23355)
1 parent dd4b8c1 commit 8dce5e5

161 files changed

Lines changed: 902 additions & 896 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bin/configs/csharp-generichost-latest-dateTimeOffset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ additionalProperties:
88
modelPropertySorting: alphabetical
99
operationParameterSorting: alphabetical
1010
useDateTimeOffset: true
11+
treatWarningsAsErrors: true
12+
warningsNotAsErrors: CS0612

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ namespace {{packageName}}.{{apiPackage}}
388388
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
389389
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
390390
? "{{{path}}}"
391-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
391+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "{{{path}}}");
392392
{{/servers}}
393393
{{#servers}}
394394
{{#-first}}

samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public async Task<IHelloWorldPostApiResponse> HelloWorldPostAsync(Option<HelloWo
246246
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
247247
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
248248
? "/helloWorld"
249-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/helloWorld");
249+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/helloWorld");
250250

251251
if (helloWorldPostRequest.IsSet)
252252
httpRequestMessageLocalVar.Content = (helloWorldPostRequest.Value as object) is System.IO.Stream stream

samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public async Task<IIconsApiResponse> IconsAsync(Option<IconsSizeParameter> size
240240
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
241241
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
242242
? "/icons"
243-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/icons");
243+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/icons");
244244

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

samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public async Task<IOneOfArrayApiResponse> OneOfArrayAsync(Option<OneOfArrayReque
227227
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
228228
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
229229
? "/one-of-array"
230-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/one-of-array");
230+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/one-of-array");
231231

232232
if (oneOfArrayRequest.IsSet)
233233
httpRequestMessageLocalVar.Content = (oneOfArrayRequest.Value as object) is System.IO.Stream stream

samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
234234
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
235235
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
236236
? "/api_keys/{id}"
237-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
237+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
238238
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
239239

240240
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
222222
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
223223
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
224224
? "/api_keys/{id}"
225-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
225+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
226226
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
227227

228228
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
222222
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
223223
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
224224
? "/api_keys/{id}"
225-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
225+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/api_keys/{id}");
226226
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
227227

228228
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<IsPackable>false</IsPackable>
88
<Nullable>enable</Nullable>
99
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
10+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11+
<WarningsNotAsErrors>CS0612</WarningsNotAsErrors>
1012
</PropertyGroup>
1113

1214
<ItemGroup>

samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public async Task<ICall123TestSpecialTagsApiResponse> Call123TestSpecialTagsAsyn
275275
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
276276
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
277277
? "/another-fake/dummy"
278-
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");
278+
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy");
279279

280280
httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream
281281
? httpRequestMessageLocalVar.Content = new StreamContent(stream)

0 commit comments

Comments
 (0)