Skip to content

Commit ca1f025

Browse files
devhl-labsdevhl-labs
authored
fixed subpath bug (#21081)
1 parent dcb8b1a commit ca1f025

File tree

115 files changed

+1866
-622
lines changed

Some content is hidden

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

115 files changed

+1866
-622
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,9 @@ namespace {{packageName}}.{{apiPackage}}
382382
uriBuilderLocalVar.Host = HttpClient.BaseAddress{{nrt!}}.Host;
383383
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
384384
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
385-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
385+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
386+
? "{{{path}}}"
387+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
386388
{{/servers}}
387389
{{#servers}}
388390
{{#-first}}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,9 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
230230
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
231231
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
232232
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
233-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
233+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
234+
? "/api_keys/{id}"
235+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
234236
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
235237

236238
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
218218
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
219219
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
220220
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
221-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
221+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
222+
? "/api_keys/{id}"
223+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
222224
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
223225

224226
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
218218
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
219219
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
220220
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
221-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
221+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
222+
? "/api_keys/{id}"
223+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
222224
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
223225

224226
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

‎samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ public async Task<IListApiResponse> ListAsync(string personId, System.Threading.
234234
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
235235
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
236236
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
237-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}");
237+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
238+
? "/person/display/{personId}"
239+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}");
238240
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString()));
239241

240242
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

‎samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ public async Task<IRootGetApiResponse> RootGetAsync(System.Threading.Cancellatio
209209
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
210210
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
211211
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
212-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
212+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
213+
? "/"
214+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
213215

214216
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
215217

‎samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ public async Task<IRootGetApiResponse> RootGetAsync(System.Threading.Cancellatio
209209
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
210210
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
211211
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
212-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
212+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
213+
? "/"
214+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
213215

214216
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
215217

‎samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ public async Task<ICall123TestSpecialTagsApiResponse> Call123TestSpecialTagsAsyn
269269
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
270270
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
271271
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
272-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");
272+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
273+
? "/another-fake/dummy"
274+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");
273275

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

‎samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,9 @@ public async Task<IFooGetApiResponse> FooGetAsync(System.Threading.CancellationT
458458
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
459459
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
460460
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
461-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo");
461+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
462+
? "/foo"
463+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo");
462464

463465
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
464466

@@ -674,7 +676,9 @@ public async Task<IGetCountryApiResponse> GetCountryAsync(string country, System
674676
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
675677
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
676678
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
677-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country");
679+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
680+
? "/country"
681+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country");
678682

679683
MultipartContent multipartContentLocalVar = new MultipartContent();
680684

@@ -846,7 +850,9 @@ public async Task<IHelloApiResponse> HelloAsync(System.Threading.CancellationTok
846850
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
847851
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
848852
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
849-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello");
853+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
854+
? "/hello"
855+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello");
850856

851857
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
852858

@@ -1039,7 +1045,9 @@ public async Task<IRolesReportGetApiResponse> RolesReportGetAsync(System.Threadi
10391045
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
10401046
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
10411047
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
1042-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report");
1048+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
1049+
? "/roles/report"
1050+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report");
10431051

10441052
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
10451053

@@ -1232,7 +1240,9 @@ public async Task<ITestApiResponse> TestAsync(System.Threading.CancellationToken
12321240
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
12331241
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
12341242
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
1235-
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test");
1243+
uriBuilderLocalVar.Path = HttpClient.BaseAddress.AbsolutePath == "/"
1244+
? "/test"
1245+
: string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test");
12361246

12371247
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
12381248

0 commit comments

Comments
 (0)