Skip to content

Commit 4721fba

Browse files
authored
Merge pull request #482 from swagger-api/dotnet_basepath_issue
read base path and create var to be used on templates for dotnet gene…
2 parents 06f724e + 51cc512 commit 4721fba

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.swagger.codegen.v3.generators.handlebars.lambda.TitlecaseLambda;
1616
import io.swagger.codegen.v3.generators.handlebars.lambda.UppercaseLambda;
1717
import io.swagger.codegen.v3.utils.ModelUtils;
18+
import io.swagger.codegen.v3.utils.URLPathUtil;
1819
import io.swagger.v3.oas.models.OpenAPI;
1920
import io.swagger.v3.oas.models.Operation;
2021
import io.swagger.v3.oas.models.PathItem;
@@ -33,6 +34,7 @@
3334
import org.slf4j.LoggerFactory;
3435

3536
import java.io.File;
37+
import java.net.URL;
3638
import java.util.ArrayList;
3739
import java.util.Arrays;
3840
import java.util.HashMap;
@@ -959,6 +961,18 @@ public void setPreserveNewLines(boolean preserveNewLines) {
959961
@Override
960962
public void preprocessOpenAPI(OpenAPI openAPI) {
961963
super.preprocessOpenAPI(openAPI);
964+
965+
final URL urlInfo = URLPathUtil.getServerURL(openAPI);
966+
if ( urlInfo != null && urlInfo.getPort() > 0) {
967+
additionalProperties.put("serverUrl", String.format("%s://%s:%s", urlInfo.getProtocol(), urlInfo.getHost(), urlInfo.getPort()));
968+
969+
if (StringUtils.isNotBlank(urlInfo.getPath())) {
970+
additionalProperties.put("basePathWithoutHost", urlInfo.getPath());
971+
}
972+
} else {
973+
additionalProperties.put("serverUrl", URLPathUtil.LOCAL_HOST);
974+
}
975+
962976
if (this.preserveNewLines) {
963977
Map<String, Schema> schemaMap = openAPI.getComponents() != null ? openAPI.getComponents().getSchemas() : null;
964978
if (schemaMap != null) {
@@ -1056,4 +1070,4 @@ public void postProcessParameter(CodegenParameter parameter) {
10561070
}
10571071
*/
10581072

1059-
}
1073+
}

src/main/java/io/swagger/codegen/v3/generators/dotnet/AspNetCoreServerCodegen.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,6 @@ public String getHelp() {
124124
return "Generates an ASP.NET Core Web API server.";
125125
}
126126

127-
@Override
128-
public void preprocessOpenAPI(OpenAPI openAPI) {
129-
super.preprocessOpenAPI(openAPI);
130-
131-
final URL urlInfo = URLPathUtil.getServerURL(openAPI);
132-
if ( urlInfo != null && urlInfo.getPort() > 0) {
133-
additionalProperties.put("serverUrl", urlInfo.toString());
134-
} else {
135-
additionalProperties.put("serverUrl", URLPathUtil.LOCAL_HOST);
136-
}
137-
}
138-
139127
@Override
140128
public void processOpts() {
141129
super.processOpts();

0 commit comments

Comments
 (0)