Skip to content

Commit a9baeba

Browse files
committed
refs - swagger-api/swagger-codegen#9203 - fix port, jackson import and jersey1 basePath
1 parent 75657ad commit a9baeba

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,9 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
947947
}
948948
if (model.discriminator != null && model.discriminator.getPropertyName().equals(property.baseName)) {
949949
property.vendorExtensions.put("x-is-discriminator-property", true);
950-
model.imports.add("JsonTypeId");
950+
if (additionalProperties.containsKey("jackson")) {
951+
model.imports.add("JsonTypeId");
952+
}
951953
}
952954
}
953955

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaJAXRSServerCodegen.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
9595
if (!this.additionalProperties.containsKey("serverPort")) {
9696
final URL urlInfo = URLPathUtil.getServerURL(openAPI);
9797
String port = "8080"; // Default value for a JEE Server
98-
if ( urlInfo != null && urlInfo.getPort() != 0) {
99-
if (urlInfo.getPort() != -1) {
98+
if ( urlInfo != null && urlInfo.getPort() > 0) {
10099
port = String.valueOf(urlInfo.getPort());
101-
}
102100
}
103101
this.additionalProperties.put("serverPort", port);
104102
}

src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/api.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import javax.ws.rs.core.Response;
2929
import javax.ws.rs.core.SecurityContext;
3030
import javax.ws.rs.*;
3131

32-
@Path("/{{{baseName}}}")
32+
{{#apiBasePath}}@Path("/{{{apiBasePath}}}"){{/apiBasePath}}
33+
{{^apiBasePath}}@Path("/{{{baseName}}}"){{/apiBasePath}}
3334
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
3435
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
3536
@io.swagger.annotations.Api(description = "the {{{baseName}}} API")
@@ -57,7 +58,7 @@ public class {{classname}} {
5758
{{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
5859
{{/parameters}}@Context SecurityContext securityContext)
5960
throws NotFoundException {
60-
return delegate.{{nickname}}({{#parameters}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/parameters}}securityContext);
61+
return delegate.{{nickname}}({{#parameters}}{{#isFile}} {{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/parameters}}securityContext);
6162
}
6263
{{/contents}}
6364
{{/operation}}

0 commit comments

Comments
 (0)