Skip to content

Commit 550e317

Browse files
devhl-labsdevhl-labs
authored
[csharp][generichost] Fixed subpath (#20896)
* fixed path * reverted part of change
1 parent 62b176e commit 550e317

File tree

115 files changed

+622
-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

+622
-622
lines changed

‎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
@@ -382,7 +382,7 @@ 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 = ClientUtils.CONTEXT_PATH + "{{{path}}}";
385+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
386386
{{/servers}}
387387
{{#servers}}
388388
{{#-first}}

‎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
@@ -230,7 +230,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
233+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
234234
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
235235

236236
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
@@ -218,7 +218,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
221+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
222222
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
223223

224224
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
@@ -218,7 +218,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
221+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
222222
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));
223223

224224
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/person/display/{personId}";
237+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}");
238238
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString()));
239239

240240
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/";
212+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
213213

214214
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
215215

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/";
212+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");
213213

214214
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
215215

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/another-fake/dummy";
272+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");
273273

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ 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 = ClientUtils.CONTEXT_PATH + "/foo";
461+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo");
462462

463463
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
464464

@@ -674,7 +674,7 @@ public async Task<IGetCountryApiResponse> GetCountryAsync(string country, System
674674
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
675675
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
676676
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
677-
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/country";
677+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/country");
678678

679679
MultipartContent multipartContentLocalVar = new MultipartContent();
680680

@@ -846,7 +846,7 @@ public async Task<IHelloApiResponse> HelloAsync(System.Threading.CancellationTok
846846
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
847847
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
848848
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
849-
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/hello";
849+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/hello");
850850

851851
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
852852

@@ -1039,7 +1039,7 @@ public async Task<IRolesReportGetApiResponse> RolesReportGetAsync(System.Threadi
10391039
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
10401040
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
10411041
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
1042-
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/roles/report";
1042+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/roles/report");
10431043

10441044
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
10451045

@@ -1232,7 +1232,7 @@ public async Task<ITestApiResponse> TestAsync(System.Threading.CancellationToken
12321232
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
12331233
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
12341234
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
1235-
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/test";
1235+
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/test");
12361236

12371237
httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
12381238

0 commit comments

Comments
 (0)