Skip to content

fix(csharp): preserve operation server paths #25548

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

Open
AndreyVMarkelov wants to merge 1 commit into
base: master
Choose a base branch
from
+237 −75
Open

fix(csharp): preserve operation server paths #25548

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
9 changes: 6 additions & 3 deletions 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 @@ -393,9 +393,12 @@ namespace {{packageName}}.{{apiPackage}}
{{#servers}}
{{#-first}}
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("{{url}}");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "{{{path}}}"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "{{{path}}}");
{{/-first}}
{{/servers}}
{{#constantParams}}
Expand Down Expand Up @@ -959,4 +962,4 @@ namespace {{packageName}}.{{apiPackage}}
}
{{/operations}}
}
{{/lambda.trimLineBreaks}}
{{/lambda.trimLineBreaks}}
32 changes: 32 additions & 0 deletions ...est/java/org/openapitools/codegen/csharpnetcore/CSharpGenericHostOperationServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2026 OpenAPI-Generator Contributors (https://openapi-generator.tech)
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.openapitools.codegen.csharpnetcore;

import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.testng.annotations.Test;

import java.nio.file.Path;

import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.newTempFolder;

public class CSharpGenericHostOperationServerTest {
@Test
public void testOperationServerRetainsPortAndAppendsPath() throws Exception {
Path output = newTempFolder();
CodegenConfigurator config = new CodegenConfigurator().setGeneratorName("csharp").setLibrary("generichost")
.setInputSpec("src/test/resources/3_0/csharp/operation-server-path.yaml")
.setOutputDir(output.toString()).addAdditionalProperty("packageName", "ServerRepro");
new DefaultGenerator().opts(config.toClientOptInput()).generate();
assertFileContains(output.resolve("src/ServerRepro/Api/DefaultApi.cs"),
"uriBuilderLocalVar.Host = urlLocalVar.Host;",
"uriBuilderLocalVar.Port = urlLocalVar.Port;",
"string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), \"/files/{id}\")",
"uriBuilderLocalVar.Path.Replace(\"%7Bid%7D\"");
}
}
19 changes: 19 additions & 0 deletions modules/openapi-generator/src/test/resources/3_0/csharp/operation-server-path.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
openapi: 3.0.3
info:
title: Server path reproduction
version: 1.0.0
paths:
/files/{id}:
get:
operationId: getFile
servers:
- url: https://example.com:8443/base
parameters:
- name: id
in: path
required: true
schema:
type: string
responses:
'200':
description: ok
14 changes: 10 additions & 4 deletions ...t/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,9 +827,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2163,9 +2166,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions ...es/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2161,9 +2164,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions ...t/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,9 +827,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2163,9 +2166,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2161,9 +2164,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions ...ent/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,9 +827,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2163,9 +2166,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions ...s/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2157,9 +2160,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
14 changes: 10 additions & 4 deletions ...les/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,9 +825,12 @@ public async Task<IAddPetApiResponse> AddPetAsync(Pet pet, System.Threading.Canc
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down Expand Up @@ -2157,9 +2160,12 @@ public async Task<IUpdatePetApiResponse> UpdatePetAsync(Pet pet, System.Threadin
using (HttpRequestMessage httpRequestMessageLocalVar = new HttpRequestMessage())
{
Uri urlLocalVar = httpRequestMessageLocalVar.RequestUri = new Uri("http://petstore.swagger.io/v2");
uriBuilderLocalVar.Host = urlLocalVar.Authority;
uriBuilderLocalVar.Host = urlLocalVar.Host;
uriBuilderLocalVar.Port = urlLocalVar.Port;
uriBuilderLocalVar.Scheme = urlLocalVar.Scheme;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath;
uriBuilderLocalVar.Path = urlLocalVar.AbsolutePath == "/"
? "/pet"
: string.Concat(urlLocalVar.AbsolutePath.TrimEnd('/'), "/pet");

httpRequestMessageLocalVar.Content = (pet as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
Expand Down
Loading
Loading