Skip to content

[csharp][generichost] Fixed subpath #20896

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 2 commits into from
Mar 24, 2025
Merged

[csharp][generichost] Fixed subpath #20896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312179d
fixed path
devhl-labs Mar 15, 2025
ef130c5
reverted part of change
devhl-labs Mar 23, 2025
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
5 changes: 0 additions & 5 deletions ...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 @@ -386,11 +386,6 @@ using System.Runtime.CompilerServices;
/// </summary>
public const string SCHEME = "{{{scheme}}}";

/// <summary>
/// The context path of the API
/// </summary>
public const string CONTEXT_PATH = "{{contextPath}}";

Comment thread
devhl-labs marked this conversation as resolved.
/// <summary>
/// The host of the API
/// </summary>
Expand Down
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 @@ -382,7 +382,7 @@ namespace {{packageName}}.{{apiPackage}}
uriBuilderLocalVar.Host = HttpClient.BaseAddress{{nrt!}}.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "{{{path}}}";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "{{{path}}}");
{{/servers}}
{{#servers}}
{{#-first}}
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 @@ -230,7 +230,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/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 @@ -218,7 +218,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/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 @@ -218,7 +218,7 @@ public async Task<IGetApiKeysIdApiResponse> GetApiKeysIdAsync(int id, System.Thr
uriBuilderLocalVar.Host = HttpClient.BaseAddress!.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/api_keys/{id}";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/api_keys/{id}");
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7Bid%7D", Uri.EscapeDataString(id.ToString()));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
5 changes: 0 additions & 5 deletions ...client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,6 @@ public static bool IsJsonMime(string mime)
/// </summary>
public const string SCHEME = "http";

/// <summary>
/// The context path of the API
/// </summary>
public const string CONTEXT_PATH = "/api/rest/v1";

/// <summary>
/// The host of the API
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.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<IListApiResponse> ListAsync(string personId, System.Threading.
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/person/display/{personId}";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/person/display/{personId}");
uriBuilderLocalVar.Path = uriBuilderLocalVar.Path.Replace("%7BpersonId%7D", Uri.EscapeDataString(personId.ToString()));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
5 changes: 0 additions & 5 deletions ...lient/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,6 @@ public static string GetDiscriminator(Utf8JsonReader utf8JsonReader, string disc
/// </summary>
public const string SCHEME = "http";

/// <summary>
/// The context path of the API
/// </summary>
public const string CONTEXT_PATH = "/v1";

/// <summary>
/// The host of the API
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public async Task<IRootGetApiResponse> RootGetAsync(System.Threading.Cancellatio
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
5 changes: 0 additions & 5 deletions ...lient/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,6 @@ public static string GetDiscriminator(Utf8JsonReader utf8JsonReader, string disc
/// </summary>
public const string SCHEME = "http";

/// <summary>
/// The context path of the API
/// </summary>
public const string CONTEXT_PATH = "";

/// <summary>
/// The host of the API
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public async Task<IRootGetApiResponse> RootGetAsync(System.Threading.Cancellatio
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
5 changes: 0 additions & 5 deletions ...store/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,6 @@ public static string GetDiscriminator(Utf8JsonReader utf8JsonReader, string disc
/// </summary>
public const string SCHEME = "http";

/// <summary>
/// The context path of the API
/// </summary>
public const string CONTEXT_PATH = "";

/// <summary>
/// The host of the API
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public async Task<ICall123TestSpecialTagsApiResponse> Call123TestSpecialTagsAsyn
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/another-fake/dummy";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/another-fake/dummy");

httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
Expand Down
10 changes: 5 additions & 5 deletions ...ient/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public async Task<IFooGetApiResponse> FooGetAsync(System.Threading.CancellationT
uriBuilderLocalVar.Host = HttpClient.BaseAddress.Host;
uriBuilderLocalVar.Port = HttpClient.BaseAddress.Port;
uriBuilderLocalVar.Scheme = HttpClient.BaseAddress.Scheme;
uriBuilderLocalVar.Path = ClientUtils.CONTEXT_PATH + "/foo";
uriBuilderLocalVar.Path = string.Concat(HttpClient.BaseAddress.AbsolutePath, "/foo");

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

MultipartContent multipartContentLocalVar = new MultipartContent();

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

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

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

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
Loading