diff --git a/docs/generators/java.md b/docs/generators/java.md index 5543c075639d..59cfdbc1ec17 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -59,6 +59,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| |sourceFolder|source folder for generated code| |src/main/java| +|swaggerAnnotations|Whether to generate Swagger annotations| |true| |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on resttemplate library| |false| |useBeanValidation|Use BeanValidation API annotations| |false| |useGzipFeature|Send gzip-encoded requests| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index e34a582460f8..d1e5926290f2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -64,6 +64,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen public static final String USE_ABSTRACTION_FOR_FILES = "useAbstractionForFiles"; public static final String DYNAMIC_OPERATIONS = "dynamicOperations"; public static final String GRADLE_PROPERTIES= "gradleProperties"; + public static final String SWAGGER_ANNOTATIONS = "swaggerAnnotations"; public static final String PLAY_24 = "play24"; public static final String PLAY_25 = "play25"; @@ -112,6 +113,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen protected boolean caseInsensitiveResponseHeaders = false; protected boolean useAbstractionForFiles = false; protected boolean dynamicOperations = false; + protected boolean swaggerAnnotations = true; protected String gradleProperties; protected String authFolder; protected String serializationLibrary = null; @@ -157,6 +159,7 @@ public JavaClientCodegen() { cliOptions.add(CliOption.newBoolean(USE_ABSTRACTION_FOR_FILES, "Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on " + RESTTEMPLATE + " library")); cliOptions.add(CliOption.newBoolean(DYNAMIC_OPERATIONS, "Generate operations dynamically at runtime from an OAS", this.dynamicOperations)); cliOptions.add(CliOption.newString(GRADLE_PROPERTIES, "Append additional Gradle proeprties to the gradle.properties file")); + cliOptions.add(CliOption.newBoolean(SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations", swaggerAnnotations)); supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libraries instead."); supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x"); @@ -326,6 +329,11 @@ public void processOpts() { } additionalProperties.put(GRADLE_PROPERTIES, gradleProperties); + if (additionalProperties.containsKey(SWAGGER_ANNOTATIONS)) { + this.setSwaggerAnnotations(convertPropertyToBoolean(SWAGGER_ANNOTATIONS)); + } + additionalProperties.put(SWAGGER_ANNOTATIONS, swaggerAnnotations); + final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/"); final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/"); final String modelsFolder = (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); @@ -802,6 +810,10 @@ public CodegenModel fromModel(String name, Schema model) { codegenModel.imports.remove("ApiModel"); } } + if (!swaggerAnnotations) { + codegenModel.imports.remove("ApiModel"); + codegenModel.imports.remove("ApiModelProperty"); + } return codegenModel; } @@ -996,6 +1008,10 @@ public void setGradleProperties(final String gradleProperties) { this.gradleProperties= gradleProperties; } + public void setSwaggerAnnotations(boolean swaggerAnnotations) { + this.swaggerAnnotations = swaggerAnnotations; + } + /** * Serialization library. * diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index 2a8fa65cc5fb..6e319146262f 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -125,7 +125,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.12.1" jackson_databind_version = "2.10.5.1" {{#openApiNullable}} @@ -141,7 +143,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.sun.jersey:jersey-client:$jersey_version" implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache index 89c3f5ffaf33..f2329f8548fd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache/pom.mustache @@ -232,11 +232,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -360,7 +362,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.21 + {{/swaggerAnnotations}} 4.5.13 2.12.1 {{#threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index 93944f967e21..299639a1fb62 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -99,7 +99,9 @@ test { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.24" + {{/swaggerAnnotations}} jackson_version = "2.10.3" jackson_databind_version = "2.10.3" {{#openApiNullable}} @@ -116,7 +118,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "io.github.openfeign:feign-core:$feign_version" implementation "io.github.openfeign:feign-jackson:$feign_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache index f2912f0dfb92..20bec50bac2b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.24" % "compile", + {{/swaggerAnnotations}} "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile", "io.github.openfeign" % "feign-core" % "10.11" % "compile", "io.github.openfeign" % "feign-jackson" % "10.11" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index 5f87e95f5691..77d3a51fa499 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -213,11 +213,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -360,7 +362,9 @@ 1.8 ${java.version} ${java.version} + {{#swaggerAnnotations}} 1.5.24 + {{/swaggerAnnotations}} 10.11 3.8.0 2.10.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 766ddb5c52db..9aa8d64cf40d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -107,7 +107,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.12.1" jackson_databind_version = "2.10.5.1" {{#openApiNullable}} @@ -124,7 +126,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.google.api-client:google-api-client:${google_api_client_version}" implementation "org.glassfish.jersey.core:jersey-common:${jersey_common_version}" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache index 721b638dd9d0..c2b2eeb3eaa5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.22", + {{/swaggerAnnotations}} "com.google.api-client" % "google-api-client" % "1.23.0", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1", "com.fasterxml.jackson.core" % "jackson-core" % "2.12.1" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index bcd5b7d3bff8..393cc2ce5c70 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -217,11 +217,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} com.google.code.findbugs @@ -314,7 +316,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} 1.30.2 2.25.1 2.12.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index a56053fc8294..5f72a77e89cb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -108,7 +108,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" {{#openApiNullable}} @@ -129,7 +131,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache index 910f21f798d3..62e61fdf6c6d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.22", + {{/swaggerAnnotations}} "org.glassfish.jersey.core" % "jersey-client" % "2.27", "org.glassfish.jersey.inject" % "jersey-hk2" % "2.27", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.27", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index e43449ddc0d9..0864b31b74c3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -2,8 +2,8 @@ * {{description}}{{^description}}{{classname}}{{/description}}{{#isDeprecated}} * @deprecated{{/isDeprecated}} */{{#isDeprecated}} -@Deprecated{{/isDeprecated}}{{#description}} -@ApiModel(description = "{{{.}}}"){{/description}} +@Deprecated{{/isDeprecated}}{{#swaggerAnnotations}}{{#description}} +@ApiModel(description = "{{{.}}}"){{/description}}{{/swaggerAnnotations}} {{#jackson}} @JsonPropertyOrder({ {{#vars}} @@ -207,7 +207,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{^required}} @javax.annotation.Nullable {{/required}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#swaggerAnnotations}}@ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/swaggerAnnotations}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 4a87eaeed453..a7f0100a105d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -232,11 +232,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -371,7 +373,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.6.1 + {{/swaggerAnnotations}} 2.30.1 2.10.5 2.10.5.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache index 46d8966d4310..2ae31b8a3fac 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache @@ -61,7 +61,9 @@ artifacts { ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.10.4" jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" @@ -71,7 +73,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index 66eb1760eb7b..1a3b78b0d161 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -5,8 +5,8 @@ import {{invokerPackage}}.JSON; * {{description}}{{^description}}{{classname}}{{/description}}{{#isDeprecated}} * @deprecated{{/isDeprecated}} */{{#isDeprecated}} -@Deprecated{{/isDeprecated}}{{#description}} -@ApiModel(description = "{{{.}}}"){{/description}} +@Deprecated{{/isDeprecated}}{{#swaggerAnnotations}}{{#description}} +@ApiModel(description = "{{{.}}}"){{/description}}{{/swaggerAnnotations}} {{#jackson}} @JsonPropertyOrder({ {{#vars}} @@ -210,7 +210,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{^required}} @javax.annotation.Nullable {{/required}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#swaggerAnnotations}}@ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/swaggerAnnotations}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache index d81feac5e79b..cca744ae9569 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache @@ -161,11 +161,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -225,7 +227,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} 11 11 2.10.4 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index 7ed25443766e..480eb6ea445f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -106,7 +106,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation 'io.swagger:swagger-annotations:1.5.24' + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache index 907e8a916ec9..aa15d2ee6888 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.24", + {{/swaggerAnnotations}} "com.squareup.okhttp3" % "okhttp" % "4.9.1", "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1", "com.google.code.gson" % "gson" % "2.8.6", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 780b025dbc7a..52aae88f8ad1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -217,11 +217,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-core-version} + {{/swaggerAnnotations}} com.google.code.findbugs diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache index 8d4602511199..426bddcabd42 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache @@ -22,7 +22,9 @@ import io.restassured.common.mapper.TypeRef; {{/jackson}} import io.restassured.http.Method; import io.restassured.response.Response; +{{#swaggerAnnotations}} import io.swagger.annotations.*; +{{/swaggerAnnotations}} import java.lang.reflect.Type; import java.util.function.Consumer; @@ -34,7 +36,9 @@ import {{invokerPackage}}.JSON; {{/gson}} import static io.restassured.http.Method.*; +{{#swaggerAnnotations}} @Api(value = "{{{baseName}}}") +{{/swaggerAnnotations}} public class {{classname}} { private Supplier reqSpecSupplier; @@ -68,12 +72,14 @@ public class {{classname}} { {{#operations}} {{#operation}} + {{#swaggerAnnotations}} @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", nickname = "{{{operationId}}}", tags = { {{#tags}}{{#name}}"{{{.}}}"{{/name}}{{^-last}}, {{/-last}}{{/tags}} }) @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}") {{^-last}},{{/-last}}{{/responses}} }) + {{/swaggerAnnotations}} {{#isDeprecated}} @Deprecated {{/isDeprecated}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index a1db459b5aec..4c45cdf420bb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -95,7 +95,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.21" + {{/swaggerAnnotations}} rest_assured_version = "4.3.0" junit_version = "4.13.1" {{#jackson}} @@ -123,7 +125,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "io.rest-assured:rest-assured:$rest_assured_version" {{#jackson}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index 22390e12e0e5..3f92ec52f839 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.21", + {{/swaggerAnnotations}} "io.rest-assured" % "rest-assured" % "4.3.0", "io.rest-assured" % "scala-support" % "4.3.0", "com.google.code.findbugs" % "jsr305" % "3.0.2", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index 7a26d17a1d93..cb3031da13c3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -219,11 +219,13 @@ {{/jackson}} + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} com.google.code.findbugs @@ -346,7 +348,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.21 + {{/swaggerAnnotations}} 4.3.0 2.8.6 1.8.4 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index 67083a02010e..b3d016890388 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -94,7 +94,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" {{#openApiNullable}} @@ -107,7 +109,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "org.jboss.resteasy:resteasy-client:$resteasy_version" implementation "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index 957990ebf217..4c01a47277b2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -9,7 +9,9 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", + {{/swaggerAnnotations}} "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile", "org.jboss.resteasy" % "resteasy-multipart-provider" % "4.5.11.Final" % "compile", "org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index 4f7c83977d51..efe13df0b556 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -166,11 +166,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} com.google.code.findbugs @@ -272,7 +274,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} 4.5.11.Final 2.10.5 2.10.5.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 43c5845302c8..67c9ef8806d6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -107,7 +107,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" {{#openApiNullable}} @@ -123,7 +125,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "org.springframework:spring-web:$spring_web_version" implementation "org.springframework:spring-context:$spring_web_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index ae3ceab24555..a8a9625cce7a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -211,11 +211,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -315,7 +317,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} 5.2.5.RELEASE 2.10.5 2.10.5.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache index 34d66a2d5304..ae6fb7e32f66 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache @@ -104,7 +104,9 @@ ext { okhttp_version = "2.7.5" oltu_version = "1.0.1" retrofit_version = "1.9.0" + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.21" + {{/swaggerAnnotations}} jakarta_annotation_version = "1.3.5" junit_version = "4.13.1" jodatime_version = "2.9.3" @@ -117,7 +119,9 @@ dependencies { implementation "com.squareup.okhttp:okhttp:$okhttp_version" implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.squareup.retrofit:retrofit:$retrofit_version" + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" implementation "joda-time:joda-time:$jodatime_version" {{#threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache index b279317657f7..d814c7d32c12 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache @@ -11,7 +11,9 @@ lazy val root = (project in file(".")). libraryDependencies ++= Seq( "com.squareup.okhttp" % "okhttp" % "2.7.5" % "compile", "com.squareup.retrofit" % "retrofit" % "1.9.0" % "compile", + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", + {{/swaggerAnnotations}} "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "joda-time" % "joda-time" % "2.9.3" % "compile", {{#threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache index 1566db9a17f4..2a0d1b4fdb44 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache @@ -217,11 +217,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} com.google.code.findbugs @@ -280,7 +282,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.21 + {{/swaggerAnnotations}} 1.9.0 2.7.5 2.9.9 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index fe9207df02d6..2345de463627 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -126,7 +126,9 @@ ext { play_version = "2.6.7" {{/play26}} {{/usePlayWS}} + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.22" + {{/swaggerAnnotations}} junit_version = "4.13.1" {{#useRxJava}} rx_java_version = "1.3.0" @@ -162,7 +164,9 @@ dependencies { implementation 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' implementation "io.reactivex.rxjava3:rxjava:$rx_java_version" {{/useRxJava3}} + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index d859cf83d247..e971c2dca682 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -42,7 +42,9 @@ lazy val root = (project in file(".")). "com.github.akarnokd" % "rxjava3-retrofit-adapter" % "3.0.0" % "compile", "io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile", {{/useRxJava3}} + {{#swaggerAnnotations}} "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", + {{/swaggerAnnotations}} "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", {{#joda}} "joda-time" % "joda-time" % "2.9.9" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 66609e17c2d9..a594b41645e2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -217,11 +217,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} com.google.code.findbugs @@ -407,7 +409,9 @@ ${java.version} ${java.version} 1.8.3 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} {{#usePlayWS}} 2.12.1 {{#play24}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index 1fce1c6262c9..d6a177af1829 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -27,7 +27,9 @@ task execute(type:JavaExec) { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.5.21" + {{/swaggerAnnotations}} jackson_version = "2.10.5" jackson_databind_version = "2.10.5.1" vertx_version = "3.4.2" @@ -42,7 +44,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-rx-java:$vertx_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index cd17acbc20f4..4782d4c78402 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -211,11 +211,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -305,7 +307,9 @@ UTF-8 3.4.2 + {{#swaggerAnnotations}} 1.5.22 + {{/swaggerAnnotations}} 2.10.5 2.10.5.1 0.2.1 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index d419eb4010d7..a09ec7220921 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -123,7 +123,9 @@ if(hasProperty('target') && target == 'android') { } ext { + {{#swaggerAnnotations}} swagger_annotations_version = "1.6.2" + {{/swaggerAnnotations}} spring_web_version = "2.4.3" jackson_version = "2.11.3" jackson_databind_version = "2.11.3" @@ -138,7 +140,9 @@ ext { } dependencies { + {{#swaggerAnnotations}} implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + {{/swaggerAnnotations}} implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "io.projectreactor:reactor-core:$reactor_version" implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_web_version" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index 3e8e1d6da3f5..fd729d3c9137 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -66,11 +66,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -148,7 +150,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.6.2 + {{/swaggerAnnotations}} 2.4.3 2.11.3 2.11.3 diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index ce4207b30404..ad91db222589 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -2,8 +2,8 @@ * {{description}}{{^description}}{{classname}}{{/description}}{{#isDeprecated}} * @deprecated{{/isDeprecated}} */{{#isDeprecated}} -@Deprecated{{/isDeprecated}}{{#description}} -@ApiModel(description = "{{{.}}}"){{/description}} +@Deprecated{{/isDeprecated}}{{#swaggerAnnotations}}{{#description}} +@ApiModel(description = "{{{.}}}"){{/description}}{{/swaggerAnnotations}} {{#jackson}} @JsonPropertyOrder({ {{#vars}} @@ -193,7 +193,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{#jsonb}} @JsonbProperty("{{baseName}}") {{/jsonb}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#swaggerAnnotations}}@ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/swaggerAnnotations}} {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index ccb784c095da..1a2e3e659811 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -232,11 +232,13 @@ + {{#swaggerAnnotations}} io.swagger swagger-annotations ${swagger-annotations-version} + {{/swaggerAnnotations}} @@ -360,7 +362,9 @@ UTF-8 + {{#swaggerAnnotations}} 1.5.21 + {{/swaggerAnnotations}} 1.19.4 2.12.1 {{#threetenbp}}