From 8692c38c5d6a3dd24fa36691b928b07d7f35e4de Mon Sep 17 00:00:00 2001 From: winrid Date: Wed, 19 Nov 2025 13:02:36 -0800 Subject: [PATCH 1/3] [Ruby] Fixes anyOf Support in Responses --- .../src/main/resources/ruby-client/api_client.mustache | 8 ++++++-- .../petstore/ruby-faraday/lib/petstore/api_client.rb | 8 ++++++-- .../client/petstore/ruby-httpx/lib/petstore/api_client.rb | 8 ++++++-- samples/client/petstore/ruby/lib/petstore/api_client.rb | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache index 192267217050..a4609a59fc27 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache @@ -135,9 +135,13 @@ module {{moduleName}} data.each { |k, v| hash[k] = convert_to_type(v, sub_type) } end else - # models (e.g. Pet) or oneOf + # models (e.g. Pet) or oneOf/anyOf klass = {{moduleName}}.const_get(return_type) - klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data) + if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) + klass.build(data) + else + klass.build_from_hash(data) + end end end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb index 3d90fdccf324..af6ccb8a8e7f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb @@ -322,9 +322,13 @@ def convert_to_type(data, return_type) data.each { |k, v| hash[k] = convert_to_type(v, sub_type) } end else - # models (e.g. Pet) or oneOf + # models (e.g. Pet) or oneOf/anyOf klass = Petstore.const_get(return_type) - klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data) + if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) + klass.build(data) + else + klass.build_from_hash(data) + end end end diff --git a/samples/client/petstore/ruby-httpx/lib/petstore/api_client.rb b/samples/client/petstore/ruby-httpx/lib/petstore/api_client.rb index cbde64c86d06..1f1f61e97019 100644 --- a/samples/client/petstore/ruby-httpx/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-httpx/lib/petstore/api_client.rb @@ -255,9 +255,13 @@ def convert_to_type(data, return_type) data.each { |k, v| hash[k] = convert_to_type(v, sub_type) } end else - # models (e.g. Pet) or oneOf + # models (e.g. Pet) or oneOf/anyOf klass = Petstore.const_get(return_type) - klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data) + if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) + klass.build(data) + else + klass.build_from_hash(data) + end end end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 51eb197704e9..9df98b163c69 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -278,9 +278,13 @@ def convert_to_type(data, return_type) data.each { |k, v| hash[k] = convert_to_type(v, sub_type) } end else - # models (e.g. Pet) or oneOf + # models (e.g. Pet) or oneOf/anyOf klass = Petstore.const_get(return_type) - klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data) + if klass.respond_to?(:openapi_one_of) || klass.respond_to?(:openapi_any_of) + klass.build(data) + else + klass.build_from_hash(data) + end end end From 1b4d85d359011a78e282b71b24d096a1b5c3b0e7 Mon Sep 17 00:00:00 2001 From: winrid Date: Wed, 19 Nov 2025 13:23:10 -0800 Subject: [PATCH 2/3] re-gen samples --- .../docs/Animal.md | 1 - .../docs/AnotherAnimal.md | 1 - .../docs/Bird.md | 2 - .../docs/Robobird.md | 2 - .../org/openapitools/client/models/Animal.kt | 12 +- .../client/models/AnotherAnimal.kt | 12 +- .../org/openapitools/client/models/Bird.kt | 9 +- .../openapitools/client/models/Robobird.kt | 9 +- .../pom.xml | 6 + .../org/openapitools/api/AnotherFakeApi.java | 6 + .../java/org/openapitools/api/FakeApi.java | 124 +++++++++++++++++- .../api/FakeClassnameTestApi.java | 9 ++ .../gen/java/org/openapitools/api/FooApi.java | 6 + .../gen/java/org/openapitools/api/PetApi.java | 90 ++++++++++++- .../java/org/openapitools/api/StoreApi.java | 29 +++- .../java/org/openapitools/api/UserApi.java | 47 ++++++- .../model/AdditionalPropertiesClass.java | 5 + .../model/AllOfWithSingleRef.java | 5 + .../java/org/openapitools/model/Animal.java | 5 + .../model/ArrayOfArrayOfNumberOnly.java | 4 + .../openapitools/model/ArrayOfNumberOnly.java | 4 + .../org/openapitools/model/ArrayTest.java | 6 + .../openapitools/model/Capitalization.java | 9 ++ .../gen/java/org/openapitools/model/Cat.java | 4 + .../java/org/openapitools/model/Category.java | 5 + .../openapitools/model/ChildWithNullable.java | 4 + .../org/openapitools/model/ClassModel.java | 6 +- .../java/org/openapitools/model/Client.java | 4 + .../openapitools/model/DeprecatedObject.java | 4 + .../gen/java/org/openapitools/model/Dog.java | 4 + .../org/openapitools/model/EnumArrays.java | 5 + .../java/org/openapitools/model/EnumTest.java | 11 ++ .../model/FakeBigDecimalMap200Response.java | 5 + .../FakeTestsDefaultsDefaultResponse.java | 7 + .../model/FileSchemaTestClass.java | 5 + .../gen/java/org/openapitools/model/Foo.java | 4 + .../model/FooGetDefaultResponse.java | 4 + .../org/openapitools/model/FormatTest.java | 19 +++ .../openapitools/model/HasOnlyReadOnly.java | 5 + .../openapitools/model/HealthCheckResult.java | 6 +- .../java/org/openapitools/model/MapTest.java | 7 + ...ropertiesAndAdditionalPropertiesClass.java | 6 + .../openapitools/model/Model200Response.java | 7 +- .../openapitools/model/ModelApiResponse.java | 6 + .../org/openapitools/model/ModelFile.java | 6 +- .../org/openapitools/model/ModelList.java | 4 + .../org/openapitools/model/ModelReturn.java | 6 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NullableClass.java | 15 +++ .../org/openapitools/model/NumberOnly.java | 4 + .../model/ObjectWithDeprecatedFields.java | 7 + .../java/org/openapitools/model/Order.java | 9 ++ .../openapitools/model/OuterComposite.java | 6 + .../model/OuterObjectWithEnumProperty.java | 4 + .../model/ParentWithNullable.java | 5 + .../gen/java/org/openapitools/model/Pet.java | 9 ++ .../org/openapitools/model/ReadOnlyFirst.java | 5 + .../openapitools/model/SpecialModelName.java | 4 + .../gen/java/org/openapitools/model/Tag.java | 5 + ...neFreeformAdditionalPropertiesRequest.java | 4 + .../gen/java/org/openapitools/model/User.java | 11 ++ .../jaxrs-spec-swagger-v3-annotations/pom.xml | 6 + .../org/openapitools/api/AnotherFakeApi.java | 6 + .../java/org/openapitools/api/FakeApi.java | 124 +++++++++++++++++- .../api/FakeClassnameTestApi.java | 9 ++ .../gen/java/org/openapitools/api/FooApi.java | 6 + .../gen/java/org/openapitools/api/PetApi.java | 90 ++++++++++++- .../java/org/openapitools/api/StoreApi.java | 29 +++- .../java/org/openapitools/api/UserApi.java | 47 ++++++- .../model/AdditionalPropertiesClass.java | 5 + .../model/AllOfWithSingleRef.java | 5 + .../java/org/openapitools/model/Animal.java | 5 + .../model/ArrayOfArrayOfNumberOnly.java | 4 + .../openapitools/model/ArrayOfNumberOnly.java | 4 + .../org/openapitools/model/ArrayTest.java | 6 + .../openapitools/model/Capitalization.java | 9 ++ .../gen/java/org/openapitools/model/Cat.java | 4 + .../java/org/openapitools/model/Category.java | 5 + .../openapitools/model/ChildWithNullable.java | 4 + .../org/openapitools/model/ClassModel.java | 6 +- .../java/org/openapitools/model/Client.java | 4 + .../openapitools/model/DeprecatedObject.java | 4 + .../gen/java/org/openapitools/model/Dog.java | 4 + .../org/openapitools/model/EnumArrays.java | 5 + .../java/org/openapitools/model/EnumTest.java | 11 ++ .../model/FakeBigDecimalMap200Response.java | 5 + .../FakeTestsDefaultsDefaultResponse.java | 7 + .../model/FileSchemaTestClass.java | 5 + .../gen/java/org/openapitools/model/Foo.java | 4 + .../model/FooGetDefaultResponse.java | 4 + .../org/openapitools/model/FormatTest.java | 19 +++ .../openapitools/model/HasOnlyReadOnly.java | 5 + .../openapitools/model/HealthCheckResult.java | 6 +- .../java/org/openapitools/model/MapTest.java | 7 + ...ropertiesAndAdditionalPropertiesClass.java | 6 + .../openapitools/model/Model200Response.java | 7 +- .../openapitools/model/ModelApiResponse.java | 6 + .../org/openapitools/model/ModelFile.java | 6 +- .../org/openapitools/model/ModelList.java | 4 + .../org/openapitools/model/ModelReturn.java | 6 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NullableClass.java | 15 +++ .../org/openapitools/model/NumberOnly.java | 4 + .../model/ObjectWithDeprecatedFields.java | 7 + .../java/org/openapitools/model/Order.java | 9 ++ .../openapitools/model/OuterComposite.java | 6 + .../model/OuterObjectWithEnumProperty.java | 4 + .../model/ParentWithNullable.java | 5 + .../gen/java/org/openapitools/model/Pet.java | 9 ++ .../org/openapitools/model/ReadOnlyFirst.java | 5 + .../openapitools/model/SpecialModelName.java | 4 + .../gen/java/org/openapitools/model/Tag.java | 5 + ...neFreeformAdditionalPropertiesRequest.java | 4 + .../gen/java/org/openapitools/model/User.java | 11 ++ 114 files changed, 1162 insertions(+), 78 deletions(-) diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md index aaffda15d819..bc6b0758c4d7 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md @@ -4,7 +4,6 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | -| **discriminator** | **kotlin.String** | | | | **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md index c5bc8ab96395..ec471ab303f4 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md @@ -5,7 +5,6 @@ | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | | **discriminator** | **kotlin.String** | | | -| **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | | **propertyB** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md index f42f4e951c03..f979cf3c0690 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md @@ -4,8 +4,6 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | -| **discriminator** | **kotlin.String** | | | -| **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.Int** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md index 8208e46652a2..4cd2eda5662e 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md @@ -4,8 +4,6 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | -| **discriminator** | **kotlin.String** | | | -| **anotherDiscriminator** | **kotlin.String** | | | | **propertyB** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt index 5daa221dc730..ec17555c7ead 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt @@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive @Serializable(with = AnimalSerializer::class) sealed interface Animal { @JvmInline - value class BirdWrapper(val value: Bird) : Animal + value class (val value: Bird) : Animal @JvmInline - value class RobobirdWrapper(val value: Robobird) : Animal + value class (val value: Robobird) : Animal } @@ -56,12 +56,12 @@ object AnimalSerializer : KSerializer { override fun serialize(encoder: Encoder, value: Animal) { require(encoder is JsonEncoder) val jsonObject = when (value) { - is Animal.BirdWrapper -> { + is Animal. -> { val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["discriminator"] = JsonPrimitive("BIRD") JsonObject(jsonMap) } - is Animal.RobobirdWrapper -> { + is Animal. -> { val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["discriminator"] = JsonPrimitive("ROBOBIRD") JsonObject(jsonMap) @@ -80,11 +80,11 @@ object AnimalSerializer : KSerializer { return when (discriminatorValue) { "BIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element) - Animal.BirdWrapper(decoded) + Animal.(decoded) } "ROBOBIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element) - Animal.RobobirdWrapper(decoded) + Animal.(decoded) } else -> throw SerializationException("Unknown Animal discriminator: $discriminatorValue") } diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt index 4fa0bb4eb937..cbe63fadb955 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt @@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive @Serializable(with = AnotherAnimalSerializer::class) sealed interface AnotherAnimal { @JvmInline - value class AnotherBirdWrapper(val value: Bird) : AnotherAnimal + value class (val value: Bird) : AnotherAnimal @JvmInline - value class AnotherRobobirdWrapper(val value: Robobird) : AnotherAnimal + value class (val value: Robobird) : AnotherAnimal } @@ -56,12 +56,12 @@ object AnotherAnimalSerializer : KSerializer { override fun serialize(encoder: Encoder, value: AnotherAnimal) { require(encoder is JsonEncoder) val jsonObject = when (value) { - is AnotherAnimal.AnotherBirdWrapper -> { + is AnotherAnimal. -> { val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_BIRD") JsonObject(jsonMap) } - is AnotherAnimal.AnotherRobobirdWrapper -> { + is AnotherAnimal. -> { val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_ROBOBIRD") JsonObject(jsonMap) @@ -80,11 +80,11 @@ object AnotherAnimalSerializer : KSerializer { return when (discriminatorValue) { "ANOTHER_BIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element) - AnotherAnimal.AnotherBirdWrapper(decoded) + AnotherAnimal.(decoded) } "ANOTHER_ROBOBIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element) - AnotherAnimal.AnotherRobobirdWrapper(decoded) + AnotherAnimal.(decoded) } else -> throw SerializationException("Unknown AnotherAnimal another_discriminator: $discriminatorValue") } diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt index f74aff360a72..da1f56ed1c7b 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt @@ -28,21 +28,14 @@ import kotlinx.serialization.encoding.Encoder /** * * - * @param discriminator - * @param anotherDiscriminator * @param propertyA * @param sameNameProperty */ @Serializable +@SerialName(value = "ANOTHER_BIRD") data class Bird ( - @SerialName(value = "discriminator") - val discriminator: kotlin.String, - - @SerialName(value = "another_discriminator") - val anotherDiscriminator: kotlin.String, - @SerialName(value = "propertyA") val propertyA: kotlin.String? = null, diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt index 7af01c66bb1a..fbeb555149b1 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt @@ -28,21 +28,14 @@ import kotlinx.serialization.encoding.Encoder /** * * - * @param discriminator - * @param anotherDiscriminator * @param propertyB * @param sameNameProperty */ @Serializable +@SerialName(value = "ANOTHER_ROBOBIRD") data class Robobird ( - @SerialName(value = "discriminator") - val discriminator: kotlin.String, - - @SerialName(value = "another_discriminator") - val anotherDiscriminator: kotlin.String, - @SerialName(value = "propertyB") val propertyB: kotlin.String? = null, diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml index 7796609e288e..8d86466fa913 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml @@ -78,6 +78,12 @@ jakarta.annotation-api ${javax.annotation-api-version} + + io.swagger + swagger-annotations + provided + 1.5.3 + io.swagger.core.v3 swagger-annotations diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 3e2193d8a0d6..e6b1f9edb690 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -5,6 +5,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,6 +21,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/another-fake/dummy") +@Api(description = "the another-fake API") @Tag(name = "another-fake") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class AnotherFakeApi { @@ -27,6 +29,10 @@ public class AnotherFakeApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) + @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Client.class) + }) @Operation(summary = "To test special tags", description = "To test special tags and operation ID starting with number") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index dbc121f4fbec..bc95efd48d00 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -22,6 +22,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -37,6 +38,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake") +@Api(description = "the fake API") @Tag(name = "fake") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeApi { @@ -44,6 +46,10 @@ public class FakeApi { @GET @Path("/BigDecimalMap") @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys", response = FakeBigDecimalMap200Response.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = FakeBigDecimalMap200Response.class) + }) @Operation(summary = "", description = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -55,6 +61,10 @@ public Response fakeBigDecimalMap() { @GET @Path("/health") @Produces({ "application/json" }) + @ApiOperation(value = "Health check endpoint", notes = "", response = HealthCheckResult.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "The instance started successfully", response = HealthCheckResult.class) + }) @Operation(summary = "Health check endpoint", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") @@ -66,11 +76,18 @@ public Response fakeHealthGet() { @GET @Path("/http-signature-test") @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "test http signature authentication", notes = "", response = Void.class, authorizations = { + + @Authorization(value = "http_signature_test") + }, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "The instance started successfully", response = Void.class) + }) @Operation(summary = "test http signature authentication", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") }) - public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") String query1,@HeaderParam("header_1") String header1) { + public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") @ApiParam("query parameter") String query1,@HeaderParam("header_1") @ApiParam("header parameter") String header1) { return Response.ok().entity("magic!").build(); } @@ -78,6 +95,10 @@ public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query @Path("/outer/boolean") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) + }) @Operation(summary = "", description = "Test serialization of outer boolean types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output boolean") @@ -90,6 +111,10 @@ public Response fakeOuterBooleanSerialize(@Valid Boolean body) { @Path("/outer/composite") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) + }) @Operation(summary = "", description = "Test serialization of object with outer number type") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output composite") @@ -102,6 +127,10 @@ public Response fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite @Path("/outer/number") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) + }) @Operation(summary = "", description = "Test serialization of outer number types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output number") @@ -114,6 +143,10 @@ public Response fakeOuterNumberSerialize(@Valid BigDecimal body) { @Path("/outer/string") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output string", response = String.class) + }) @Operation(summary = "", description = "Test serialization of outer string types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output string") @@ -126,6 +159,10 @@ public Response fakeOuterStringSerialize(@Valid String body) { @Path("/property/enum-int") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of enum (int) properties with examples", response = OuterObjectWithEnumProperty.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output enum (int)", response = OuterObjectWithEnumProperty.class) + }) @Operation(summary = "", description = "Test serialization of enum (int) properties with examples") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output enum (int)") @@ -137,6 +174,10 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith @GET @Path("/tests/defaults") @Produces({ "application/json" }) + @ApiOperation(value = "test enum default in request body", notes = "", response = FakeTestsDefaultsDefaultResponse.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "response", response = FakeTestsDefaultsDefaultResponse.class) + }) @Operation(summary = "test enum default in request body", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") @@ -148,6 +189,10 @@ public Response fakeTestsDefaults() { @POST @Path("/additionalProperties-reference") @Consumes({ "application/json" }) + @ApiOperation(value = "test referenced additionalProperties", notes = "", response = Void.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "test referenced additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -159,6 +204,10 @@ public Response testAdditionalPropertiesReference(@Valid @NotNull Map enumHeaderStringArray,@QueryParam("enum_query_string_array") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public Response testEnumParameters(@HeaderParam("enum_header_string_array") @ApiParam("Header parameter enum test (string array)") List enumHeaderStringArray,@QueryParam("enum_query_string_array") @ApiParam("Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @ApiParam("Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @ApiParam("Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @ApiParam("Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { return Response.ok().entity("magic!").build(); } @DELETE + @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, authorizations = { + + @Authorization(value = "bearer_test") + }, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Something wrong", response = Void.class) + }) @Operation(summary = "Fake endpoint to test group parameters (optional)", description = "Fake endpoint to test group parameters (optional)") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Something wrong") }) - public Response testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@QueryParam("string_group") Integer stringGroup,@HeaderParam("boolean_group") Boolean booleanGroup,@QueryParam("int64_group") Long int64Group) { + public Response testGroupParameters(@QueryParam("required_string_group") @NotNull @ApiParam("Required String in group parameters") Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull @ApiParam("Required Integer in group parameters") Long requiredInt64Group,@QueryParam("string_group") @ApiParam("String in group parameters") Integer stringGroup,@HeaderParam("boolean_group") @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group") @ApiParam("Integer in group parameters") Long int64Group) { return Response.ok().entity("magic!").build(); } @POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) + @ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "test inline additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -245,6 +333,10 @@ public Response testInlineAdditionalProperties(@Valid @NotNull Map reque @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) + @ApiOperation(value = "uploads an image (required)", notes = "", response = ModelApiResponse.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) + }) @Operation(summary = "uploads an image (required)", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 20831afb6bc5..da86f9415030 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -5,6 +5,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,6 +21,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake_classname_test") +@Api(description = "the fake_classname_test API") @Tag(name = "fake_classname_test") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeClassnameTestApi { @@ -27,6 +29,13 @@ public class FakeClassnameTestApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) + @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", response = Client.class, authorizations = { + + @Authorization(value = "api_key_query") + }, tags={ "fake_classname_tags 123#$%^" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Client.class) + }) @Operation(summary = "To test class name in snake case", description = "To test class name in snake case") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java index bf9b7977931c..247099fbddc7 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java @@ -5,6 +5,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,12 +21,17 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/foo") +@Api(description = "the foo API") @Tag(name = "foo") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FooApi { @GET @Produces({ "application/json" }) + @ApiOperation(value = "", notes = "", response = FooGetDefaultResponse.class, tags={ }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "response", response = FooGetDefaultResponse.class) + }) @Operation(summary = "", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java index b07bfbed4b41..ce7a822fe757 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -23,12 +24,22 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/pet") +@Api(description = "the pet API") @Tag(name = "pet") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class PetApi { @POST @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 405, message = "Invalid input", response = Void.class) + }) @Operation(summary = "Add a new pet to the store", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -40,54 +51,104 @@ public Response addPet(@Valid @NotNull Pet pet) { @DELETE @Path("/{petId}") + @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @io.swagger.annotations.ApiImplicitParams({ + @io.swagger.annotations.ApiImplicitParam(name = "api_key", value = "", dataType = "String", paramType = "header") + }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) + }) @Operation(summary = "Deletes a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "400", description = "Invalid pet value") }) - public Response deletePet(@PathParam("petId") Long petId) { + public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) + }) @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { + public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), + @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) + }) @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") }) - public Response findPetsByTags(@QueryParam("tags") @NotNull Set tags) { + public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags) { return Response.ok().entity("magic!").build(); } @GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Pet not found", response = Void.class) + }) @Operation(summary = "Find pet by ID", description = "Returns a single pet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found") }) - public Response getPetById(@PathParam("petId") Long petId) { + public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") Long petId) { return Response.ok().entity("magic!").build(); } @PUT @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Pet not found", response = Void.class), + @ApiResponse(code = 405, message = "Validation exception", response = Void.class) + }) @Operation(summary = "Update an existing pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -102,12 +163,21 @@ public Response updatePet(@Valid @NotNull Pet pet) { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) + @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 405, message = "Invalid input", response = Void.class) + }) @Operation(summary = "Updates a pet in the store with form data", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "405", description = "Invalid input") }) - public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { + public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { return Response.ok().entity("magic!").build(); } @@ -115,11 +185,19 @@ public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(valu @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) + @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) + }) @Operation(summary = "uploads an image", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFile(@PathParam("petId") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java index 9bdd7e83c580..28334d8a647f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,6 +6,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,24 +22,37 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/store") +@Api(description = "the store API") @Tag(name = "store") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class StoreApi { @DELETE @Path("/order/{order_id}") + @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Order not found", response = Void.class) + }) @Operation(summary = "Delete purchase order by ID", description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response deleteOrder(@PathParam("order_id") String orderId) { + public Response deleteOrder(@PathParam("order_id") @ApiParam("ID of the order that needs to be deleted") String orderId) { return Response.ok().entity("magic!").build(); } @GET @Path("/inventory") @Produces({ "application/json" }) + @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { + + @Authorization(value = "api_key") + }, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") + }) @Operation(summary = "Returns pet inventories by status", description = "Returns a map of status codes to quantities") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -50,13 +64,19 @@ public Response getInventory() { @GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Order not found", response = Void.class) + }) @Operation(summary = "Find purchase order by ID", description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long orderId) { + public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam("ID of pet that needs to be fetched") Long orderId) { return Response.ok().entity("magic!").build(); } @@ -64,6 +84,11 @@ public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long order @Path("/order") @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) + }) @Operation(summary = "Place an order for a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java index 80fec44e6d4f..7426e4aa6f06 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java @@ -6,6 +6,7 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,12 +22,17 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/user") +@Api(description = "the user API") @Tag(name = "user") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class UserApi { @POST @Consumes({ "application/json" }) + @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Create user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -38,6 +44,10 @@ public Response createUser(@Valid @NotNull User user) { @POST @Path("/createWithArray") @Consumes({ "application/json" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -49,6 +59,10 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @POST @Path("/createWithList") @Consumes({ "application/json" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -59,42 +73,62 @@ public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) @DELETE @Path("/{username}") + @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Delete user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response deleteUser(@PathParam("username") String username) { + public Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = User.class), + @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Get user by user name", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response getUserByName(@PathParam("username") String username) { + public Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing.") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/login") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = String.class), + @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) + }) @Operation(summary = "Logs user into the system", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") }) - public Response loginUser(@QueryParam("username") @NotNull String username,@QueryParam("password") @NotNull String password) { + public Response loginUser(@QueryParam("username") @NotNull @ApiParam("The user name for login") String username,@QueryParam("password") @NotNull @ApiParam("The password for login in clear text") String password) { return Response.ok().entity("magic!").build(); } @GET @Path("/logout") + @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Logs out current logged in user session", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -106,12 +140,17 @@ public Response logoutUser() { @PUT @Path("/{username}") @Consumes({ "application/json" }) + @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Updated user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response updateUser(@PathParam("username") String username,@Valid @NotNull User user) { + public Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid @NotNull User user) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 572a9047c853..180815aabf85 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_property") public Map getMapProperty() { @@ -73,6 +77,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java index 17cf3b463527..1a206290261c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.SingleRefType; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public AllOfWithSingleRef username(String username) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -56,6 +60,7 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SingleRefType") public SingleRefType getSingleRefType() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java index 58f03001a091..d195949e967f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java @@ -3,10 +3,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -51,6 +54,7 @@ public Animal className(String className) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "className") @NotNull public String getClassName() { @@ -70,6 +74,7 @@ public Animal color(String color) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("color") public String getColor() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 56f450820cdf..0354d5fb01c8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -8,6 +10,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayArrayNumber") @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 510b41b48cf1..8532833ff9bc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -8,6 +10,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayNumber") @Valid public List<@Valid BigDecimal> getArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index c4e3c9f0c461..148be4281c29 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -8,6 +10,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,6 +45,7 @@ public ArrayTest arrayOfString(List arrayOfString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_of_string") @Size(min=0,max=3)public List getArrayOfString() { @@ -77,6 +81,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -112,6 +117,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_model") @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java index 1afe1773507f..834f6397abb4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -44,6 +47,7 @@ public Capitalization smallCamel(String smallCamel) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("smallCamel") public String getSmallCamel() { @@ -63,6 +67,7 @@ public Capitalization capitalCamel(String capitalCamel) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { @@ -82,6 +87,7 @@ public Capitalization smallSnake(String smallSnake) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("small_Snake") public String getSmallSnake() { @@ -101,6 +107,7 @@ public Capitalization capitalSnake(String capitalSnake) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { @@ -120,6 +127,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { @@ -140,6 +148,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { } + @ApiModelProperty(value = "Name of the pet ") @Schema(description = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java index a3a1cc80f042..00901784fee7 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public Cat declawed(Boolean declawed) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java index 4fdb24f7f44c..8efc87828841 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,6 +46,7 @@ public Category id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -62,6 +66,7 @@ public Category name(String name) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java index 57097d65fa75..3ff1df85ecc9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.ParentWithNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("otherProperty") public String getOtherProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java index c3efb9f5891a..2709cf65b7cb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,7 +17,7 @@ /** * Model for testing model with \"_class\" property **/ - +@ApiModel(description = "Model for testing model with \"_class\" property") @Schema(description="Model for testing model with \"_class\" property") @JsonTypeName("ClassModel") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -36,6 +39,7 @@ public ClassModel propertyClass(String propertyClass) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("_class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java index 200395b16f58..0de4fed21922 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public Client client(String client) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("client") public String getClient() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java index e316c80794c8..c6b4ffa0173f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public DeprecatedObject name(String name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java index fd0386dd4e50..9adfb971681f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public Dog breed(String breed) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index 393f627ed9bd..89ab2672434c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -7,6 +9,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -133,6 +136,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { @@ -152,6 +156,7 @@ public EnumArrays arrayEnum(List arrayEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_enum") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java index 9e49ad8e7060..36e1839edfc6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.OuterEnum; import org.openapitools.model.OuterEnumDefaultValue; @@ -10,6 +12,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -249,6 +252,7 @@ public EnumTest enumString(EnumStringEnum enumString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { @@ -268,6 +272,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "enum_string_required") @NotNull public EnumStringRequiredEnum getEnumStringRequired() { @@ -287,6 +292,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { @@ -306,6 +312,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { @@ -325,6 +332,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { @@ -344,6 +352,7 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumInteger") public OuterEnumInteger getOuterEnumInteger() { @@ -363,6 +372,7 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumDefaultValue") public OuterEnumDefaultValue getOuterEnumDefaultValue() { @@ -382,6 +392,7 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumIntegerDefaultValue") public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 3e1be0fc9cb1..081ca1f15903 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -8,6 +10,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,6 +43,7 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someId") @Valid public BigDecimal getSomeId() { @@ -59,6 +63,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someMap") @Valid public Map getSomeMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java index 04b9f8e8cfbe..6208e38986c7 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java @@ -1,12 +1,15 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.IntegerEnum; import org.openapitools.model.StringEnum; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -137,6 +140,7 @@ public FakeTestsDefaultsDefaultResponse stringEnum(StringEnum stringEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnum") public StringEnum getStringEnum() { @@ -156,6 +160,7 @@ public FakeTestsDefaultsDefaultResponse integerEnum(IntegerEnum integerEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnum") public IntegerEnum getIntegerEnum() { @@ -175,6 +180,7 @@ public FakeTestsDefaultsDefaultResponse stringEnumInline(StringEnumInlineEnum st } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnumInline") public StringEnumInlineEnum getStringEnumInline() { @@ -194,6 +200,7 @@ public FakeTestsDefaultsDefaultResponse integerEnumInline(IntegerEnumInlineEnum } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnumInline") public IntegerEnumInlineEnum getIntegerEnumInline() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 28ee5c23b271..aebabb6fbead 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -8,6 +10,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,6 +43,7 @@ public FileSchemaTestClass _file(ModelFile _file) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("file") @Valid public ModelFile getFile() { @@ -59,6 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("files") @Valid public List<@Valid ModelFile> getFiles() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java index a7a3387c5593..7c0a18a908a8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public Foo bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java index c08f51b6ac1a..3a73ef03278b 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java @@ -1,11 +1,14 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Foo; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public FooGetDefaultResponse string(Foo string) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Valid public Foo getString() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java index 4b778c9dff4f..3423f5cb7303 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -11,6 +13,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -86,6 +89,7 @@ public FormatTest integer(Integer integer) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer") @Min(10) @Max(100)public Integer getInteger() { @@ -107,6 +111,7 @@ public FormatTest int32(Integer int32) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int32") @Min(20) @Max(200)public Integer getInt32() { @@ -126,6 +131,7 @@ public FormatTest int64(Long int64) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int64") public Long getInt64() { @@ -147,6 +153,7 @@ public FormatTest number(BigDecimal number) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { @@ -168,6 +175,7 @@ public FormatTest _float(Float _float) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { @@ -189,6 +197,7 @@ public FormatTest _double(Double _double) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { @@ -208,6 +217,7 @@ public FormatTest decimal(BigDecimal decimal) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("decimal") @Valid public BigDecimal getDecimal() { @@ -227,6 +237,7 @@ public FormatTest string(String string) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i")public String getString() { @@ -246,6 +257,7 @@ public FormatTest _byte(byte[] _byte) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "byte") @NotNull public byte[] getByte() { @@ -265,6 +277,7 @@ public FormatTest binary(File binary) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("binary") public File getBinary() { @@ -284,6 +297,7 @@ public FormatTest date(LocalDate date) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "date") @NotNull public LocalDate getDate() { @@ -303,6 +317,7 @@ public FormatTest dateTime(Date dateTime) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -322,6 +337,7 @@ public FormatTest uuid(UUID uuid) { } + @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -341,6 +357,7 @@ public FormatTest password(String password) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "password") @NotNull @Size(min=10,max=64)public String getPassword() { @@ -361,6 +378,7 @@ public FormatTest patternWithDigits(String patternWithDigits) { } + @ApiModelProperty(value = "A string that is a 10 digit number. Can have leading zeros.") @Schema(description = "A string that is a 10 digit number. Can have leading zeros.") @JsonProperty("pattern_with_digits") @Pattern(regexp="^\\d{10}$")public String getPatternWithDigits() { @@ -381,6 +399,7 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim } + @ApiModelProperty(value = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @Schema(description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @JsonProperty("pattern_with_digits_and_delimiter") @Pattern(regexp="/^image_\\d{1,3}$/i")public String getPatternWithDigitsAndDelimiter() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 097f215e4002..69c894f8d861 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public HasOnlyReadOnly bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -56,6 +60,7 @@ public HasOnlyReadOnly foo(String foo) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("foo") public String getFoo() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java index 7239283a0895..98b0a97f2fe4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. **/ - +@ApiModel(description = "Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @Schema(description="Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @JsonTypeName("HealthCheckResult") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -37,6 +40,7 @@ public HealthCheckResult nullableMessage(String nullableMessage) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("NullableMessage") public String getNullableMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java index 4ff129e77d26..63ccefa84243 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -89,6 +92,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { @@ -124,6 +128,7 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { @@ -159,6 +164,7 @@ public MapTest directMap(Map directMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("direct_map") public Map getDirectMap() { @@ -194,6 +200,7 @@ public MapTest indirectMap(Map indirectMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("indirect_map") public Map getIndirectMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 83520d738599..9d2d0b005343 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -9,6 +11,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -62,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -81,6 +86,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map") @Valid public Map getMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java index 1ee640912918..bc9fbfb5b600 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Model for testing model name starting with number **/ - +@ApiModel(description = "Model for testing model name starting with number") @Schema(description="Model for testing model name starting with number") @JsonTypeName("200_response") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -39,6 +42,7 @@ public Model200Response name(Integer name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public Integer getName() { @@ -58,6 +62,7 @@ public Model200Response propertyClass(String propertyClass) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java index ba8efa0a16a1..bcbcc5f80d1a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,6 +42,7 @@ public ModelApiResponse code(Integer code) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("code") public Integer getCode() { @@ -58,6 +62,7 @@ public ModelApiResponse type(String type) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public String getType() { @@ -77,6 +82,7 @@ public ModelApiResponse message(String message) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("message") public String getMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java index f813e6b9c2fe..bf99888b7302 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Must be named `File` for test. **/ - +@ApiModel(description = "Must be named `File` for test.") @Schema(description="Must be named `File` for test.") @JsonTypeName("File") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -38,6 +41,7 @@ public ModelFile sourceURI(String sourceURI) { } + @ApiModelProperty(value = "Test capitalization") @Schema(description = "Test capitalization") @JsonProperty("sourceURI") public String getSourceURI() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java index 715a840e82d9..5738bb6f82d9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public ModelList _123list(String _123list) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123-list") public String get123list() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java index 6382984af112..f417484a9045 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Model for testing reserved words **/ - +@ApiModel(description = "Model for testing reserved words") @Schema(description="Model for testing reserved words") @JsonTypeName("Return") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -37,6 +40,7 @@ public ModelReturn _return(Integer _return) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("return") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java index 3e3abc2fa325..90bcc66c7944 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,7 +17,7 @@ /** * Model for testing model name same as property name **/ - +@ApiModel(description = "Model for testing model name same as property name") @Schema(description="Model for testing model name same as property name") @JsonTypeName("Name") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -49,6 +52,7 @@ public Name name(Integer name) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public Integer getName() { @@ -68,6 +72,7 @@ public Name snakeCase(Integer snakeCase) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("snake_case") public Integer getSnakeCase() { @@ -87,6 +92,7 @@ public Name property(String property) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("property") public String getProperty() { @@ -106,6 +112,7 @@ public Name _123number(Integer _123number) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123Number") public Integer get123number() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java index 4d131695e54b..f918e4e706b3 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -13,6 +15,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -50,6 +53,7 @@ public NullableClass integerProp(Integer integerProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer_prop") public Integer getIntegerProp() { @@ -69,6 +73,7 @@ public NullableClass numberProp(BigDecimal numberProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("number_prop") @Valid public BigDecimal getNumberProp() { @@ -88,6 +93,7 @@ public NullableClass booleanProp(Boolean booleanProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("boolean_prop") public Boolean getBooleanProp() { @@ -107,6 +113,7 @@ public NullableClass stringProp(String stringProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string_prop") public String getStringProp() { @@ -126,6 +133,7 @@ public NullableClass dateProp(LocalDate dateProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("date_prop") public LocalDate getDateProp() { @@ -145,6 +153,7 @@ public NullableClass datetimeProp(Date datetimeProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("datetime_prop") public Date getDatetimeProp() { @@ -164,6 +173,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_nullable_prop") public List getArrayNullableProp() { @@ -199,6 +209,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_and_items_nullable_prop") public List getArrayAndItemsNullableProp() { @@ -234,6 +245,7 @@ public NullableClass arrayItemsNullable(List arrayItemsNullable) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_items_nullable") public List getArrayItemsNullable() { @@ -269,6 +281,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_nullable_prop") public Map getObjectNullableProp() { @@ -304,6 +317,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_and_items_nullable_prop") public Map getObjectAndItemsNullableProp() { @@ -339,6 +353,7 @@ public NullableClass objectItemsNullable(Map objectItemsNullable } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_items_nullable") public Map getObjectItemsNullable() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java index 75e682baf206..c3c41e71bda7 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("JustNumber") @Valid public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 849a00776b54..b4e8cbd5d96a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -9,6 +11,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public ObjectWithDeprecatedFields uuid(String uuid) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public String getUuid() { @@ -64,6 +68,7 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") @Valid public BigDecimal getId() { @@ -83,6 +88,7 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { @@ -102,6 +108,7 @@ public ObjectWithDeprecatedFields bars(List bars) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bars") public List getBars() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java index 887639544ff0..6d3d2b93ad74 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -92,6 +95,7 @@ public Order id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -111,6 +115,7 @@ public Order petId(Long petId) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("petId") public Long getPetId() { @@ -130,6 +135,7 @@ public Order quantity(Integer quantity) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -149,6 +155,7 @@ public Order shipDate(Date shipDate) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -169,6 +176,7 @@ public Order status(StatusEnum status) { } + @ApiModelProperty(value = "Order Status") @Schema(description = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -188,6 +196,7 @@ public Order complete(Boolean complete) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java index 4252a318c02e..3a2e430040dd 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,6 +42,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_number") @Valid public BigDecimal getMyNumber() { @@ -58,6 +62,7 @@ public OuterComposite myString(String myString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_string") public String getMyString() { @@ -77,6 +82,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_boolean") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java index 8f9c2b9eb2c9..a0de4bd3221e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnumInteger; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,6 +45,7 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "value") @NotNull public OuterEnumInteger getValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java index 0204c0dbf136..5b131d5ed530 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -3,11 +3,14 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -91,6 +94,7 @@ public ParentWithNullable type(TypeEnum type) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public TypeEnum getType() { @@ -110,6 +114,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("nullableProperty") public String getNullableProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java index 6e8fe3cb22a6..61256c6a2aeb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -12,6 +14,7 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -108,6 +111,7 @@ public Pet id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -127,6 +131,7 @@ public Pet category(Category category) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("category") @Valid public Category getCategory() { @@ -146,6 +151,7 @@ public Pet name(String name) { } + @ApiModelProperty(example = "doggie", required = true, value = "") @Schema(example = "doggie", required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { @@ -165,6 +171,7 @@ public Pet photoUrls(Set photoUrls) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "photoUrls") @NotNull public Set getPhotoUrls() { @@ -201,6 +208,7 @@ public Pet tags(List<@Valid Tag> tags) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("tags") @Valid public List<@Valid Tag> getTags() { @@ -237,6 +245,7 @@ public Pet status(StatusEnum status) { } + @ApiModelProperty(value = "pet status in the store") @Schema(description = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index df92ae9af53c..a4f5e610578a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public ReadOnlyFirst bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -55,6 +59,7 @@ public ReadOnlyFirst baz(String baz) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("baz") public String getBaz() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java index 88f1e41fc8b0..aabc23881594 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public SpecialModelName() { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java index e94bf00580af..47c7d33ff400 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public Tag id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -55,6 +59,7 @@ public Tag name(String name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java index c68f26ff2c58..f71f8c0c8787 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -1,12 +1,15 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -33,6 +36,7 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someProperty") public String getSomeProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java index 1cf8c6524290..b6fe8c83358f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,6 +51,7 @@ public User id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -67,6 +71,7 @@ public User username(String username) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -86,6 +91,7 @@ public User firstName(String firstName) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("firstName") public String getFirstName() { @@ -105,6 +111,7 @@ public User lastName(String lastName) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("lastName") public String getLastName() { @@ -124,6 +131,7 @@ public User email(String email) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("email") public String getEmail() { @@ -143,6 +151,7 @@ public User password(String password) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("password") public String getPassword() { @@ -162,6 +171,7 @@ public User phone(String phone) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("phone") public String getPhone() { @@ -182,6 +192,7 @@ public User userStatus(Integer userStatus) { } + @ApiModelProperty(value = "User Status") @Schema(description = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml index bda392827e61..387705be3d0e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml @@ -78,6 +78,12 @@ javax.annotation-api ${javax.annotation-api-version} + + io.swagger + swagger-annotations + provided + 1.5.3 + io.swagger.core.v3 swagger-annotations diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java index ee0fc23ec292..073443d29010 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -5,6 +5,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,6 +21,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/another-fake/dummy") +@Api(description = "the another-fake API") @Tag(name = "another-fake") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class AnotherFakeApi { @@ -27,6 +29,10 @@ public class AnotherFakeApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) + @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Client.class) + }) @Operation(summary = "To test special tags", description = "To test special tags and operation ID starting with number") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java index 1859eee64c03..8d273989c783 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -22,6 +22,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -37,6 +38,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake") +@Api(description = "the fake API") @Tag(name = "fake") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeApi { @@ -44,6 +46,10 @@ public class FakeApi { @GET @Path("/BigDecimalMap") @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys", response = FakeBigDecimalMap200Response.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = FakeBigDecimalMap200Response.class) + }) @Operation(summary = "", description = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -55,6 +61,10 @@ public Response fakeBigDecimalMap() { @GET @Path("/health") @Produces({ "application/json" }) + @ApiOperation(value = "Health check endpoint", notes = "", response = HealthCheckResult.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "The instance started successfully", response = HealthCheckResult.class) + }) @Operation(summary = "Health check endpoint", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") @@ -66,11 +76,18 @@ public Response fakeHealthGet() { @GET @Path("/http-signature-test") @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "test http signature authentication", notes = "", response = Void.class, authorizations = { + + @Authorization(value = "http_signature_test") + }, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "The instance started successfully", response = Void.class) + }) @Operation(summary = "test http signature authentication", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") }) - public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") String query1,@HeaderParam("header_1") String header1) { + public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") @ApiParam("query parameter") String query1,@HeaderParam("header_1") @ApiParam("header parameter") String header1) { return Response.ok().entity("magic!").build(); } @@ -78,6 +95,10 @@ public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query @Path("/outer/boolean") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) + }) @Operation(summary = "", description = "Test serialization of outer boolean types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output boolean") @@ -90,6 +111,10 @@ public Response fakeOuterBooleanSerialize(@Valid Boolean body) { @Path("/outer/composite") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) + }) @Operation(summary = "", description = "Test serialization of object with outer number type") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output composite") @@ -102,6 +127,10 @@ public Response fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite @Path("/outer/number") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) + }) @Operation(summary = "", description = "Test serialization of outer number types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output number") @@ -114,6 +143,10 @@ public Response fakeOuterNumberSerialize(@Valid BigDecimal body) { @Path("/outer/string") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output string", response = String.class) + }) @Operation(summary = "", description = "Test serialization of outer string types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output string") @@ -126,6 +159,10 @@ public Response fakeOuterStringSerialize(@Valid String body) { @Path("/property/enum-int") @Consumes({ "application/json" }) @Produces({ "*/*" }) + @ApiOperation(value = "", notes = "Test serialization of enum (int) properties with examples", response = OuterObjectWithEnumProperty.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Output enum (int)", response = OuterObjectWithEnumProperty.class) + }) @Operation(summary = "", description = "Test serialization of enum (int) properties with examples") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output enum (int)") @@ -137,6 +174,10 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith @GET @Path("/tests/defaults") @Produces({ "application/json" }) + @ApiOperation(value = "test enum default in request body", notes = "", response = FakeTestsDefaultsDefaultResponse.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "response", response = FakeTestsDefaultsDefaultResponse.class) + }) @Operation(summary = "test enum default in request body", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") @@ -148,6 +189,10 @@ public Response fakeTestsDefaults() { @POST @Path("/additionalProperties-reference") @Consumes({ "application/json" }) + @ApiOperation(value = "test referenced additionalProperties", notes = "", response = Void.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "test referenced additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -159,6 +204,10 @@ public Response testAdditionalPropertiesReference(@Valid @NotNull Map enumHeaderStringArray,@QueryParam("enum_query_string_array") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public Response testEnumParameters(@HeaderParam("enum_header_string_array") @ApiParam("Header parameter enum test (string array)") List enumHeaderStringArray,@QueryParam("enum_query_string_array") @ApiParam("Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @ApiParam("Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @ApiParam("Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @ApiParam("Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { return Response.ok().entity("magic!").build(); } @DELETE + @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, authorizations = { + + @Authorization(value = "bearer_test") + }, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Something wrong", response = Void.class) + }) @Operation(summary = "Fake endpoint to test group parameters (optional)", description = "Fake endpoint to test group parameters (optional)") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Something wrong") }) - public Response testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@QueryParam("string_group") Integer stringGroup,@HeaderParam("boolean_group") Boolean booleanGroup,@QueryParam("int64_group") Long int64Group) { + public Response testGroupParameters(@QueryParam("required_string_group") @NotNull @ApiParam("Required String in group parameters") Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull @ApiParam("Required Integer in group parameters") Long requiredInt64Group,@QueryParam("string_group") @ApiParam("String in group parameters") Integer stringGroup,@HeaderParam("boolean_group") @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group") @ApiParam("Integer in group parameters") Long int64Group) { return Response.ok().entity("magic!").build(); } @POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) + @ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "test inline additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -245,6 +333,10 @@ public Response testInlineAdditionalProperties(@Valid @NotNull Map reque @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) + @ApiOperation(value = "uploads an image (required)", notes = "", response = ModelApiResponse.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) + }) @Operation(summary = "uploads an image (required)", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 6a476f5f40dc..9324dd47118f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -5,6 +5,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,6 +21,7 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake_classname_test") +@Api(description = "the fake_classname_test API") @Tag(name = "fake_classname_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeClassnameTestApi { @@ -27,6 +29,13 @@ public class FakeClassnameTestApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) + @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", response = Client.class, authorizations = { + + @Authorization(value = "api_key_query") + }, tags={ "fake_classname_tags 123#$%^" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Client.class) + }) @Operation(summary = "To test class name in snake case", description = "To test class name in snake case") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java index 7a594b4a26a4..6138354326f0 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java @@ -5,6 +5,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -20,12 +21,17 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/foo") +@Api(description = "the foo API") @Tag(name = "foo") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FooApi { @GET @Produces({ "application/json" }) + @ApiOperation(value = "", notes = "", response = FooGetDefaultResponse.class, tags={ }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "response", response = FooGetDefaultResponse.class) + }) @Operation(summary = "", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java index d21d38c0b624..3f72e1e42273 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -23,12 +24,22 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/pet") +@Api(description = "the pet API") @Tag(name = "pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class PetApi { @POST @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 405, message = "Invalid input", response = Void.class) + }) @Operation(summary = "Add a new pet to the store", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -40,54 +51,104 @@ public Response addPet(@Valid @NotNull Pet pet) { @DELETE @Path("/{petId}") + @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @io.swagger.annotations.ApiImplicitParams({ + @io.swagger.annotations.ApiImplicitParam(name = "api_key", value = "", dataType = "String", paramType = "header") + }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) + }) @Operation(summary = "Deletes a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "400", description = "Invalid pet value") }) - public Response deletePet(@PathParam("petId") Long petId) { + public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) + }) @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { + public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), + @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) + }) @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") }) - public Response findPetsByTags(@QueryParam("tags") @NotNull Set tags) { + public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags) { return Response.ok().entity("magic!").build(); } @GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { + + @Authorization(value = "api_key") + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Pet.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Pet not found", response = Void.class) + }) @Operation(summary = "Find pet by ID", description = "Returns a single pet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found") }) - public Response getPetById(@PathParam("petId") Long petId) { + public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") Long petId) { return Response.ok().entity("magic!").build(); } @PUT @Consumes({ "application/json", "application/xml" }) + @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Pet not found", response = Void.class), + @ApiResponse(code = 405, message = "Validation exception", response = Void.class) + }) @Operation(summary = "Update an existing pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -102,12 +163,21 @@ public Response updatePet(@Valid @NotNull Pet pet) { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) + @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = Void.class), + @ApiResponse(code = 405, message = "Invalid input", response = Void.class) + }) @Operation(summary = "Updates a pet in the store with form data", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "405", description = "Invalid input") }) - public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { + public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { return Response.ok().entity("magic!").build(); } @@ -115,11 +185,19 @@ public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(valu @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) + @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { + @Authorization(value = "petstore_auth", scopes = { + @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), + @AuthorizationScope(scope = "read:pets", description = "read your pets") }) + }, tags={ "pet" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) + }) @Operation(summary = "uploads an image", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFile(@PathParam("petId") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java index fd6b095a212a..e1a2ea6660f6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,6 +6,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,24 +22,37 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/store") +@Api(description = "the store API") @Tag(name = "store") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class StoreApi { @DELETE @Path("/order/{order_id}") + @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Order not found", response = Void.class) + }) @Operation(summary = "Delete purchase order by ID", description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response deleteOrder(@PathParam("order_id") String orderId) { + public Response deleteOrder(@PathParam("order_id") @ApiParam("ID of the order that needs to be deleted") String orderId) { return Response.ok().entity("magic!").build(); } @GET @Path("/inventory") @Produces({ "application/json" }) + @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { + + @Authorization(value = "api_key") + }, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") + }) @Operation(summary = "Returns pet inventories by status", description = "Returns a map of status codes to quantities") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -50,13 +64,19 @@ public Response getInventory() { @GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), + @ApiResponse(code = 404, message = "Order not found", response = Void.class) + }) @Operation(summary = "Find purchase order by ID", description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long orderId) { + public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam("ID of pet that needs to be fetched") Long orderId) { return Response.ok().entity("magic!").build(); } @@ -64,6 +84,11 @@ public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long order @Path("/order") @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Order.class), + @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) + }) @Operation(summary = "Place an order for a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java index 4717e56539d9..312d7dce0e80 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -6,6 +6,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,12 +22,17 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/user") +@Api(description = "the user API") @Tag(name = "user") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class UserApi { @POST @Consumes({ "application/json" }) + @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Create user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -38,6 +44,10 @@ public Response createUser(@Valid @NotNull User user) { @POST @Path("/createWithArray") @Consumes({ "application/json" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -49,6 +59,10 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @POST @Path("/createWithList") @Consumes({ "application/json" }) + @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -59,42 +73,62 @@ public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) @DELETE @Path("/{username}") + @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Delete user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response deleteUser(@PathParam("username") String username) { + public Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = User.class), + @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Get user by user name", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response getUserByName(@PathParam("username") String username) { + public Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing.") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/login") @Produces({ "application/xml", "application/json" }) + @ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = String.class), + @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) + }) @Operation(summary = "Logs user into the system", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") }) - public Response loginUser(@QueryParam("username") @NotNull String username,@QueryParam("password") @NotNull String password) { + public Response loginUser(@QueryParam("username") @NotNull @ApiParam("The user name for login") String username,@QueryParam("password") @NotNull @ApiParam("The password for login in clear text") String password) { return Response.ok().entity("magic!").build(); } @GET @Path("/logout") + @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation", response = Void.class) + }) @Operation(summary = "Logs out current logged in user session", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -106,12 +140,17 @@ public Response logoutUser() { @PUT @Path("/{username}") @Consumes({ "application/json" }) + @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) + @ApiResponses(value = { + @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), + @ApiResponse(code = 404, message = "User not found", response = Void.class) + }) @Operation(summary = "Updated user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response updateUser(@PathParam("username") String username,@Valid @NotNull User user) { + public Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid @NotNull User user) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 09556eb4391a..49027a0d5486 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_property") public Map getMapProperty() { @@ -73,6 +77,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java index 9a9d2013d449..33fcf8ddde3f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.SingleRefType; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public AllOfWithSingleRef username(String username) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -56,6 +60,7 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SingleRefType") public SingleRefType getSingleRefType() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java index c531dafe3d43..ac9dc4c51b45 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java @@ -3,10 +3,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -51,6 +54,7 @@ public Animal className(String className) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "className") @NotNull public String getClassName() { @@ -70,6 +74,7 @@ public Animal color(String color) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("color") public String getColor() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 847d3bbb882d..d810a52d1d09 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -8,6 +10,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayArrayNumber") @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 29ea779583ad..9829ce6f91ba 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -8,6 +10,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +41,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayNumber") @Valid public List<@Valid BigDecimal> getArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java index 6e6e9d3dd2fc..9baac0941d7b 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -8,6 +10,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,6 +45,7 @@ public ArrayTest arrayOfString(List arrayOfString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_of_string") @Size(min=0,max=3)public List getArrayOfString() { @@ -77,6 +81,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -112,6 +117,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_model") @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java index 9ea63b2d30b2..4477def91999 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -44,6 +47,7 @@ public Capitalization smallCamel(String smallCamel) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("smallCamel") public String getSmallCamel() { @@ -63,6 +67,7 @@ public Capitalization capitalCamel(String capitalCamel) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { @@ -82,6 +87,7 @@ public Capitalization smallSnake(String smallSnake) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("small_Snake") public String getSmallSnake() { @@ -101,6 +107,7 @@ public Capitalization capitalSnake(String capitalSnake) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { @@ -120,6 +127,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { @@ -140,6 +148,7 @@ public Capitalization ATT_NAME(String ATT_NAME) { } + @ApiModelProperty(value = "Name of the pet ") @Schema(description = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java index dcb069429389..acedda1ee800 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public Cat declawed(Boolean declawed) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java index 28e68450d531..590cbae499a8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,6 +46,7 @@ public Category id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -62,6 +66,7 @@ public Category name(String name) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java index 8f15e6f0df51..1dbf1747eae9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.ParentWithNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("otherProperty") public String getOtherProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java index 65b40894b7e2..151bc9c7cbd6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,7 +17,7 @@ /** * Model for testing model with \"_class\" property **/ - +@ApiModel(description = "Model for testing model with \"_class\" property") @Schema(description="Model for testing model with \"_class\" property") @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -36,6 +39,7 @@ public ClassModel propertyClass(String propertyClass) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("_class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java index 2002b99e32ca..d281d724f0db 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public Client client(String client) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("client") public String getClient() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java index d46a439df2f6..052315b936e9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public DeprecatedObject name(String name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java index e4dad61f7a19..6deb37b45f4f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public Dog breed(String breed) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java index cca78144e5e6..ad6da41186a4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -7,6 +9,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -133,6 +136,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { @@ -152,6 +156,7 @@ public EnumArrays arrayEnum(List arrayEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_enum") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java index d1774f19ef5f..b814bbf151f4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.OuterEnum; import org.openapitools.model.OuterEnumDefaultValue; @@ -10,6 +12,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -249,6 +252,7 @@ public EnumTest enumString(EnumStringEnum enumString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { @@ -268,6 +272,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "enum_string_required") @NotNull public EnumStringRequiredEnum getEnumStringRequired() { @@ -287,6 +292,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { @@ -306,6 +312,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { @@ -325,6 +332,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { @@ -344,6 +352,7 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumInteger") public OuterEnumInteger getOuterEnumInteger() { @@ -363,6 +372,7 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumDefaultValue") public OuterEnumDefaultValue getOuterEnumDefaultValue() { @@ -382,6 +392,7 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumIntegerDefaultValue") public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index aafda9f9fe9c..71e0b5be41e9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -8,6 +10,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,6 +43,7 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someId") @Valid public BigDecimal getSomeId() { @@ -59,6 +63,7 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someMap") @Valid public Map getSomeMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java index 3d236bb4b425..db1276790c3d 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java @@ -1,12 +1,15 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.IntegerEnum; import org.openapitools.model.StringEnum; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -137,6 +140,7 @@ public FakeTestsDefaultsDefaultResponse stringEnum(StringEnum stringEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnum") public StringEnum getStringEnum() { @@ -156,6 +160,7 @@ public FakeTestsDefaultsDefaultResponse integerEnum(IntegerEnum integerEnum) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnum") public IntegerEnum getIntegerEnum() { @@ -175,6 +180,7 @@ public FakeTestsDefaultsDefaultResponse stringEnumInline(StringEnumInlineEnum st } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnumInline") public StringEnumInlineEnum getStringEnumInline() { @@ -194,6 +200,7 @@ public FakeTestsDefaultsDefaultResponse integerEnumInline(IntegerEnumInlineEnum } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnumInline") public IntegerEnumInlineEnum getIntegerEnumInline() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index b0808a981f93..d5b5faafb1d8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -8,6 +10,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,6 +43,7 @@ public FileSchemaTestClass _file(ModelFile _file) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("file") @Valid public ModelFile getFile() { @@ -59,6 +63,7 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("files") @Valid public List<@Valid ModelFile> getFiles() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java index e999fb79b983..96fb78510558 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -34,6 +37,7 @@ public Foo bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java index b4fbcdd7c0dc..7916e0d2e2ef 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java @@ -1,11 +1,14 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Foo; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public FooGetDefaultResponse string(Foo string) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Valid public Foo getString() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java index 467a85e0a423..037aa2bf95c5 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -11,6 +13,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -86,6 +89,7 @@ public FormatTest integer(Integer integer) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer") @Min(10) @Max(100)public Integer getInteger() { @@ -107,6 +111,7 @@ public FormatTest int32(Integer int32) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int32") @Min(20) @Max(200)public Integer getInt32() { @@ -126,6 +131,7 @@ public FormatTest int64(Long int64) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int64") public Long getInt64() { @@ -147,6 +153,7 @@ public FormatTest number(BigDecimal number) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { @@ -168,6 +175,7 @@ public FormatTest _float(Float _float) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { @@ -189,6 +197,7 @@ public FormatTest _double(Double _double) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { @@ -208,6 +217,7 @@ public FormatTest decimal(BigDecimal decimal) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("decimal") @Valid public BigDecimal getDecimal() { @@ -227,6 +237,7 @@ public FormatTest string(String string) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i")public String getString() { @@ -246,6 +257,7 @@ public FormatTest _byte(byte[] _byte) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "byte") @NotNull public byte[] getByte() { @@ -265,6 +277,7 @@ public FormatTest binary(File binary) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("binary") public File getBinary() { @@ -284,6 +297,7 @@ public FormatTest date(LocalDate date) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "date") @NotNull public LocalDate getDate() { @@ -303,6 +317,7 @@ public FormatTest dateTime(Date dateTime) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -322,6 +337,7 @@ public FormatTest uuid(UUID uuid) { } + @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -341,6 +357,7 @@ public FormatTest password(String password) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "password") @NotNull @Size(min=10,max=64)public String getPassword() { @@ -361,6 +378,7 @@ public FormatTest patternWithDigits(String patternWithDigits) { } + @ApiModelProperty(value = "A string that is a 10 digit number. Can have leading zeros.") @Schema(description = "A string that is a 10 digit number. Can have leading zeros.") @JsonProperty("pattern_with_digits") @Pattern(regexp="^\\d{10}$")public String getPatternWithDigits() { @@ -381,6 +399,7 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim } + @ApiModelProperty(value = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @Schema(description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @JsonProperty("pattern_with_digits_and_delimiter") @Pattern(regexp="/^image_\\d{1,3}$/i")public String getPatternWithDigitsAndDelimiter() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 04b430103b61..9178293d72fb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,6 +40,7 @@ public HasOnlyReadOnly bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -56,6 +60,7 @@ public HasOnlyReadOnly foo(String foo) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("foo") public String getFoo() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java index c3faaee75882..b612975caead 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. **/ - +@ApiModel(description = "Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @Schema(description="Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @JsonTypeName("HealthCheckResult") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -37,6 +40,7 @@ public HealthCheckResult nullableMessage(String nullableMessage) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("NullableMessage") public String getNullableMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java index d2c47955a0d2..699cd8d699bb 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java @@ -1,11 +1,14 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -89,6 +92,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { @@ -124,6 +128,7 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { @@ -159,6 +164,7 @@ public MapTest directMap(Map directMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("direct_map") public Map getDirectMap() { @@ -194,6 +200,7 @@ public MapTest indirectMap(Map indirectMap) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("indirect_map") public Map getIndirectMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 7794077e6950..154be655dc71 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -9,6 +11,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -62,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -81,6 +86,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map") @Valid public Map getMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java index db2848fd996f..1a161fa0846d 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Model for testing model name starting with number **/ - +@ApiModel(description = "Model for testing model name starting with number") @Schema(description="Model for testing model name starting with number") @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -39,6 +42,7 @@ public Model200Response name(Integer name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public Integer getName() { @@ -58,6 +62,7 @@ public Model200Response propertyClass(String propertyClass) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java index 3512064eebc5..5fb56323f379 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,6 +42,7 @@ public ModelApiResponse code(Integer code) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("code") public Integer getCode() { @@ -58,6 +62,7 @@ public ModelApiResponse type(String type) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public String getType() { @@ -77,6 +82,7 @@ public ModelApiResponse message(String message) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("message") public String getMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java index 6481a56724dd..5c91c10e0a4a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Must be named `File` for test. **/ - +@ApiModel(description = "Must be named `File` for test.") @Schema(description="Must be named `File` for test.") @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -38,6 +41,7 @@ public ModelFile sourceURI(String sourceURI) { } + @ApiModelProperty(value = "Test capitalization") @Schema(description = "Test capitalization") @JsonProperty("sourceURI") public String getSourceURI() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java index 0418b0742f00..a68c09eaf97c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public ModelList _123list(String _123list) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123-list") public String get123list() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java index 21708ddb78ab..6f24d55869d9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,7 +18,7 @@ /** * Model for testing reserved words **/ - +@ApiModel(description = "Model for testing reserved words") @Schema(description="Model for testing reserved words") @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -37,6 +40,7 @@ public ModelReturn _return(Integer _return) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("return") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java index 1093dc026082..8c9d9a56bdee 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -14,7 +17,7 @@ /** * Model for testing model name same as property name **/ - +@ApiModel(description = "Model for testing model name same as property name") @Schema(description="Model for testing model name same as property name") @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -49,6 +52,7 @@ public Name name(Integer name) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public Integer getName() { @@ -68,6 +72,7 @@ public Name snakeCase(Integer snakeCase) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("snake_case") public Integer getSnakeCase() { @@ -87,6 +92,7 @@ public Name property(String property) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("property") public String getProperty() { @@ -106,6 +112,7 @@ public Name _123number(Integer _123number) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123Number") public Integer get123number() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java index ba7ab0f5d832..b6c80e7d9412 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -13,6 +15,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -50,6 +53,7 @@ public NullableClass integerProp(Integer integerProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer_prop") public Integer getIntegerProp() { @@ -69,6 +73,7 @@ public NullableClass numberProp(BigDecimal numberProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("number_prop") @Valid public BigDecimal getNumberProp() { @@ -88,6 +93,7 @@ public NullableClass booleanProp(Boolean booleanProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("boolean_prop") public Boolean getBooleanProp() { @@ -107,6 +113,7 @@ public NullableClass stringProp(String stringProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string_prop") public String getStringProp() { @@ -126,6 +133,7 @@ public NullableClass dateProp(LocalDate dateProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("date_prop") public LocalDate getDateProp() { @@ -145,6 +153,7 @@ public NullableClass datetimeProp(Date datetimeProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("datetime_prop") public Date getDatetimeProp() { @@ -164,6 +173,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_nullable_prop") public List getArrayNullableProp() { @@ -199,6 +209,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_and_items_nullable_prop") public List getArrayAndItemsNullableProp() { @@ -234,6 +245,7 @@ public NullableClass arrayItemsNullable(List arrayItemsNullable) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_items_nullable") public List getArrayItemsNullable() { @@ -269,6 +281,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_nullable_prop") public Map getObjectNullableProp() { @@ -304,6 +317,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_and_items_nullable_prop") public Map getObjectAndItemsNullableProp() { @@ -339,6 +353,7 @@ public NullableClass objectItemsNullable(Map objectItemsNullable } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_items_nullable") public Map getObjectItemsNullable() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java index 1057c0ba31d3..d1d3e27be23a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("JustNumber") @Valid public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index a28d3f2cc723..7574ba165d1c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -1,5 +1,7 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -9,6 +11,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,6 +48,7 @@ public ObjectWithDeprecatedFields uuid(String uuid) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public String getUuid() { @@ -64,6 +68,7 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") @Valid public BigDecimal getId() { @@ -83,6 +88,7 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { @@ -102,6 +108,7 @@ public ObjectWithDeprecatedFields bars(List bars) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bars") public List getBars() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java index 0d738476e0a6..cb19a704b586 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -92,6 +95,7 @@ public Order id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -111,6 +115,7 @@ public Order petId(Long petId) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("petId") public Long getPetId() { @@ -130,6 +135,7 @@ public Order quantity(Integer quantity) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -149,6 +155,7 @@ public Order shipDate(Date shipDate) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -169,6 +176,7 @@ public Order status(StatusEnum status) { } + @ApiModelProperty(value = "Order Status") @Schema(description = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -188,6 +196,7 @@ public Order complete(Boolean complete) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java index 9051eb76d6e8..7e65361b629f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,6 +42,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_number") @Valid public BigDecimal getMyNumber() { @@ -58,6 +62,7 @@ public OuterComposite myString(String myString) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_string") public String getMyString() { @@ -77,6 +82,7 @@ public OuterComposite myBoolean(Boolean myBoolean) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_boolean") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java index 626633b65567..bb91956a7400 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java @@ -1,10 +1,13 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnumInteger; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,6 +45,7 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "value") @NotNull public OuterEnumInteger getValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java index 750ba0cf47da..85e51ed609f7 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -3,11 +3,14 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -91,6 +94,7 @@ public ParentWithNullable type(TypeEnum type) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public TypeEnum getType() { @@ -110,6 +114,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("nullableProperty") public String getNullableProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java index 97fe2ac5e797..ae5466b55fa4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -1,6 +1,8 @@ package org.openapitools.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -12,6 +14,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -108,6 +111,7 @@ public Pet id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -127,6 +131,7 @@ public Pet category(Category category) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("category") @Valid public Category getCategory() { @@ -146,6 +151,7 @@ public Pet name(String name) { } + @ApiModelProperty(example = "doggie", required = true, value = "") @Schema(example = "doggie", required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { @@ -165,6 +171,7 @@ public Pet photoUrls(Set photoUrls) { } + @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "photoUrls") @NotNull public Set getPhotoUrls() { @@ -201,6 +208,7 @@ public Pet tags(List<@Valid Tag> tags) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("tags") @Valid public List<@Valid Tag> getTags() { @@ -237,6 +245,7 @@ public Pet status(StatusEnum status) { } + @ApiModelProperty(value = "pet status in the store") @Schema(description = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index 396374dc05b8..c1f123a9eb2c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public ReadOnlyFirst bar(String bar) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -55,6 +59,7 @@ public ReadOnlyFirst baz(String baz) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("baz") public String getBaz() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java index f0fd3e255295..2a5ccb00e235 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -1,10 +1,13 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -35,6 +38,7 @@ public SpecialModelName() { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java index 8ca87aec0bea..93d61c9a67b2 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,6 +39,7 @@ public Tag id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -55,6 +59,7 @@ public Tag name(String name) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java index 896f32091319..1b3b4216f2aa 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -1,12 +1,15 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -33,6 +36,7 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someProperty") public String getSomeProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java index 20dbdeb5f03a..87284e131bbc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java @@ -1,9 +1,12 @@ package org.openapitools.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,6 +51,7 @@ public User id(Long id) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -67,6 +71,7 @@ public User username(String username) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -86,6 +91,7 @@ public User firstName(String firstName) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("firstName") public String getFirstName() { @@ -105,6 +111,7 @@ public User lastName(String lastName) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("lastName") public String getLastName() { @@ -124,6 +131,7 @@ public User email(String email) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("email") public String getEmail() { @@ -143,6 +151,7 @@ public User password(String password) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("password") public String getPassword() { @@ -162,6 +171,7 @@ public User phone(String phone) { } + @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("phone") public String getPhone() { @@ -182,6 +192,7 @@ public User userStatus(Integer userStatus) { } + @ApiModelProperty(value = "User Status") @Schema(description = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { From 212d5611fa7ca7f48c3a5f1a7044b3f4f636f407 Mon Sep 17 00:00:00 2001 From: winrid Date: Wed, 19 Nov 2025 13:25:05 -0800 Subject: [PATCH 3/3] Revert "re-gen samples" This reverts commit 1b4d85d359011a78e282b71b24d096a1b5c3b0e7. --- .../docs/Animal.md | 1 + .../docs/AnotherAnimal.md | 1 + .../docs/Bird.md | 2 + .../docs/Robobird.md | 2 + .../org/openapitools/client/models/Animal.kt | 12 +- .../client/models/AnotherAnimal.kt | 12 +- .../org/openapitools/client/models/Bird.kt | 9 +- .../openapitools/client/models/Robobird.kt | 9 +- .../pom.xml | 6 - .../org/openapitools/api/AnotherFakeApi.java | 6 - .../java/org/openapitools/api/FakeApi.java | 124 +----------------- .../api/FakeClassnameTestApi.java | 9 -- .../gen/java/org/openapitools/api/FooApi.java | 6 - .../gen/java/org/openapitools/api/PetApi.java | 90 +------------ .../java/org/openapitools/api/StoreApi.java | 29 +--- .../java/org/openapitools/api/UserApi.java | 47 +------ .../model/AdditionalPropertiesClass.java | 5 - .../model/AllOfWithSingleRef.java | 5 - .../java/org/openapitools/model/Animal.java | 5 - .../model/ArrayOfArrayOfNumberOnly.java | 4 - .../openapitools/model/ArrayOfNumberOnly.java | 4 - .../org/openapitools/model/ArrayTest.java | 6 - .../openapitools/model/Capitalization.java | 9 -- .../gen/java/org/openapitools/model/Cat.java | 4 - .../java/org/openapitools/model/Category.java | 5 - .../openapitools/model/ChildWithNullable.java | 4 - .../org/openapitools/model/ClassModel.java | 6 +- .../java/org/openapitools/model/Client.java | 4 - .../openapitools/model/DeprecatedObject.java | 4 - .../gen/java/org/openapitools/model/Dog.java | 4 - .../org/openapitools/model/EnumArrays.java | 5 - .../java/org/openapitools/model/EnumTest.java | 11 -- .../model/FakeBigDecimalMap200Response.java | 5 - .../FakeTestsDefaultsDefaultResponse.java | 7 - .../model/FileSchemaTestClass.java | 5 - .../gen/java/org/openapitools/model/Foo.java | 4 - .../model/FooGetDefaultResponse.java | 4 - .../org/openapitools/model/FormatTest.java | 19 --- .../openapitools/model/HasOnlyReadOnly.java | 5 - .../openapitools/model/HealthCheckResult.java | 6 +- .../java/org/openapitools/model/MapTest.java | 7 - ...ropertiesAndAdditionalPropertiesClass.java | 6 - .../openapitools/model/Model200Response.java | 7 +- .../openapitools/model/ModelApiResponse.java | 6 - .../org/openapitools/model/ModelFile.java | 6 +- .../org/openapitools/model/ModelList.java | 4 - .../org/openapitools/model/ModelReturn.java | 6 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NullableClass.java | 15 --- .../org/openapitools/model/NumberOnly.java | 4 - .../model/ObjectWithDeprecatedFields.java | 7 - .../java/org/openapitools/model/Order.java | 9 -- .../openapitools/model/OuterComposite.java | 6 - .../model/OuterObjectWithEnumProperty.java | 4 - .../model/ParentWithNullable.java | 5 - .../gen/java/org/openapitools/model/Pet.java | 9 -- .../org/openapitools/model/ReadOnlyFirst.java | 5 - .../openapitools/model/SpecialModelName.java | 4 - .../gen/java/org/openapitools/model/Tag.java | 5 - ...neFreeformAdditionalPropertiesRequest.java | 4 - .../gen/java/org/openapitools/model/User.java | 11 -- .../jaxrs-spec-swagger-v3-annotations/pom.xml | 6 - .../org/openapitools/api/AnotherFakeApi.java | 6 - .../java/org/openapitools/api/FakeApi.java | 124 +----------------- .../api/FakeClassnameTestApi.java | 9 -- .../gen/java/org/openapitools/api/FooApi.java | 6 - .../gen/java/org/openapitools/api/PetApi.java | 90 +------------ .../java/org/openapitools/api/StoreApi.java | 29 +--- .../java/org/openapitools/api/UserApi.java | 47 +------ .../model/AdditionalPropertiesClass.java | 5 - .../model/AllOfWithSingleRef.java | 5 - .../java/org/openapitools/model/Animal.java | 5 - .../model/ArrayOfArrayOfNumberOnly.java | 4 - .../openapitools/model/ArrayOfNumberOnly.java | 4 - .../org/openapitools/model/ArrayTest.java | 6 - .../openapitools/model/Capitalization.java | 9 -- .../gen/java/org/openapitools/model/Cat.java | 4 - .../java/org/openapitools/model/Category.java | 5 - .../openapitools/model/ChildWithNullable.java | 4 - .../org/openapitools/model/ClassModel.java | 6 +- .../java/org/openapitools/model/Client.java | 4 - .../openapitools/model/DeprecatedObject.java | 4 - .../gen/java/org/openapitools/model/Dog.java | 4 - .../org/openapitools/model/EnumArrays.java | 5 - .../java/org/openapitools/model/EnumTest.java | 11 -- .../model/FakeBigDecimalMap200Response.java | 5 - .../FakeTestsDefaultsDefaultResponse.java | 7 - .../model/FileSchemaTestClass.java | 5 - .../gen/java/org/openapitools/model/Foo.java | 4 - .../model/FooGetDefaultResponse.java | 4 - .../org/openapitools/model/FormatTest.java | 19 --- .../openapitools/model/HasOnlyReadOnly.java | 5 - .../openapitools/model/HealthCheckResult.java | 6 +- .../java/org/openapitools/model/MapTest.java | 7 - ...ropertiesAndAdditionalPropertiesClass.java | 6 - .../openapitools/model/Model200Response.java | 7 +- .../openapitools/model/ModelApiResponse.java | 6 - .../org/openapitools/model/ModelFile.java | 6 +- .../org/openapitools/model/ModelList.java | 4 - .../org/openapitools/model/ModelReturn.java | 6 +- .../gen/java/org/openapitools/model/Name.java | 9 +- .../org/openapitools/model/NullableClass.java | 15 --- .../org/openapitools/model/NumberOnly.java | 4 - .../model/ObjectWithDeprecatedFields.java | 7 - .../java/org/openapitools/model/Order.java | 9 -- .../openapitools/model/OuterComposite.java | 6 - .../model/OuterObjectWithEnumProperty.java | 4 - .../model/ParentWithNullable.java | 5 - .../gen/java/org/openapitools/model/Pet.java | 9 -- .../org/openapitools/model/ReadOnlyFirst.java | 5 - .../openapitools/model/SpecialModelName.java | 4 - .../gen/java/org/openapitools/model/Tag.java | 5 - ...neFreeformAdditionalPropertiesRequest.java | 4 - .../gen/java/org/openapitools/model/User.java | 11 -- 114 files changed, 78 insertions(+), 1162 deletions(-) diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md index bc6b0758c4d7..aaffda15d819 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Animal.md @@ -4,6 +4,7 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | +| **discriminator** | **kotlin.String** | | | | **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md index ec471ab303f4..c5bc8ab96395 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/AnotherAnimal.md @@ -5,6 +5,7 @@ | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | | **discriminator** | **kotlin.String** | | | +| **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | | **propertyB** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md index f979cf3c0690..f42f4e951c03 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Bird.md @@ -4,6 +4,8 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | +| **discriminator** | **kotlin.String** | | | +| **anotherDiscriminator** | **kotlin.String** | | | | **propertyA** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.Int** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md index 4cd2eda5662e..8208e46652a2 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/docs/Robobird.md @@ -4,6 +4,8 @@ ## Properties | Name | Type | Description | Notes | | ------------ | ------------- | ------------- | ------------- | +| **discriminator** | **kotlin.String** | | | +| **anotherDiscriminator** | **kotlin.String** | | | | **propertyB** | **kotlin.String** | | [optional] | | **sameNameProperty** | **kotlin.String** | | [optional] | diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt index ec17555c7ead..5daa221dc730 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt @@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive @Serializable(with = AnimalSerializer::class) sealed interface Animal { @JvmInline - value class (val value: Bird) : Animal + value class BirdWrapper(val value: Bird) : Animal @JvmInline - value class (val value: Robobird) : Animal + value class RobobirdWrapper(val value: Robobird) : Animal } @@ -56,12 +56,12 @@ object AnimalSerializer : KSerializer { override fun serialize(encoder: Encoder, value: Animal) { require(encoder is JsonEncoder) val jsonObject = when (value) { - is Animal. -> { + is Animal.BirdWrapper -> { val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["discriminator"] = JsonPrimitive("BIRD") JsonObject(jsonMap) } - is Animal. -> { + is Animal.RobobirdWrapper -> { val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["discriminator"] = JsonPrimitive("ROBOBIRD") JsonObject(jsonMap) @@ -80,11 +80,11 @@ object AnimalSerializer : KSerializer { return when (discriminatorValue) { "BIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element) - Animal.(decoded) + Animal.BirdWrapper(decoded) } "ROBOBIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element) - Animal.(decoded) + Animal.RobobirdWrapper(decoded) } else -> throw SerializationException("Unknown Animal discriminator: $discriminatorValue") } diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt index cbe63fadb955..4fa0bb4eb937 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/AnotherAnimal.kt @@ -43,10 +43,10 @@ import kotlinx.serialization.json.jsonPrimitive @Serializable(with = AnotherAnimalSerializer::class) sealed interface AnotherAnimal { @JvmInline - value class (val value: Bird) : AnotherAnimal + value class AnotherBirdWrapper(val value: Bird) : AnotherAnimal @JvmInline - value class (val value: Robobird) : AnotherAnimal + value class AnotherRobobirdWrapper(val value: Robobird) : AnotherAnimal } @@ -56,12 +56,12 @@ object AnotherAnimalSerializer : KSerializer { override fun serialize(encoder: Encoder, value: AnotherAnimal) { require(encoder is JsonEncoder) val jsonObject = when (value) { - is AnotherAnimal. -> { + is AnotherAnimal.AnotherBirdWrapper -> { val jsonMap = encoder.json.encodeToJsonElement(Bird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_BIRD") JsonObject(jsonMap) } - is AnotherAnimal. -> { + is AnotherAnimal.AnotherRobobirdWrapper -> { val jsonMap = encoder.json.encodeToJsonElement(Robobird.serializer(), value.value).jsonObject.toMutableMap() jsonMap["another_discriminator"] = JsonPrimitive("ANOTHER_ROBOBIRD") JsonObject(jsonMap) @@ -80,11 +80,11 @@ object AnotherAnimalSerializer : KSerializer { return when (discriminatorValue) { "ANOTHER_BIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Bird.serializer(), element) - AnotherAnimal.(decoded) + AnotherAnimal.AnotherBirdWrapper(decoded) } "ANOTHER_ROBOBIRD" -> { val decoded = decoder.json.decodeFromJsonElement(Robobird.serializer(), element) - AnotherAnimal.(decoded) + AnotherAnimal.AnotherRobobirdWrapper(decoded) } else -> throw SerializationException("Unknown AnotherAnimal another_discriminator: $discriminatorValue") } diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt index da1f56ed1c7b..f74aff360a72 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt @@ -28,14 +28,21 @@ import kotlinx.serialization.encoding.Encoder /** * * + * @param discriminator + * @param anotherDiscriminator * @param propertyA * @param sameNameProperty */ @Serializable -@SerialName(value = "ANOTHER_BIRD") data class Bird ( + @SerialName(value = "discriminator") + val discriminator: kotlin.String, + + @SerialName(value = "another_discriminator") + val anotherDiscriminator: kotlin.String, + @SerialName(value = "propertyA") val propertyA: kotlin.String? = null, diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt index fbeb555149b1..7af01c66bb1a 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Robobird.kt @@ -28,14 +28,21 @@ import kotlinx.serialization.encoding.Encoder /** * * + * @param discriminator + * @param anotherDiscriminator * @param propertyB * @param sameNameProperty */ @Serializable -@SerialName(value = "ANOTHER_ROBOBIRD") data class Robobird ( + @SerialName(value = "discriminator") + val discriminator: kotlin.String, + + @SerialName(value = "another_discriminator") + val anotherDiscriminator: kotlin.String, + @SerialName(value = "propertyB") val propertyB: kotlin.String? = null, diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml index 8d86466fa913..7796609e288e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/pom.xml @@ -78,12 +78,6 @@ jakarta.annotation-api ${javax.annotation-api-version} - - io.swagger - swagger-annotations - provided - 1.5.3 - io.swagger.core.v3 swagger-annotations diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java index e6b1f9edb690..3e2193d8a0d6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -5,7 +5,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,7 +20,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/another-fake/dummy") -@Api(description = "the another-fake API") @Tag(name = "another-fake") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class AnotherFakeApi { @@ -29,10 +27,6 @@ public class AnotherFakeApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Client.class) - }) @Operation(summary = "To test special tags", description = "To test special tags and operation ID starting with number") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index bc95efd48d00..dbc121f4fbec 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -22,7 +22,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -38,7 +37,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake") -@Api(description = "the fake API") @Tag(name = "fake") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeApi { @@ -46,10 +44,6 @@ public class FakeApi { @GET @Path("/BigDecimalMap") @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys", response = FakeBigDecimalMap200Response.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = FakeBigDecimalMap200Response.class) - }) @Operation(summary = "", description = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -61,10 +55,6 @@ public Response fakeBigDecimalMap() { @GET @Path("/health") @Produces({ "application/json" }) - @ApiOperation(value = "Health check endpoint", notes = "", response = HealthCheckResult.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "The instance started successfully", response = HealthCheckResult.class) - }) @Operation(summary = "Health check endpoint", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") @@ -76,18 +66,11 @@ public Response fakeHealthGet() { @GET @Path("/http-signature-test") @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "test http signature authentication", notes = "", response = Void.class, authorizations = { - - @Authorization(value = "http_signature_test") - }, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "The instance started successfully", response = Void.class) - }) @Operation(summary = "test http signature authentication", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") }) - public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") @ApiParam("query parameter") String query1,@HeaderParam("header_1") @ApiParam("header parameter") String header1) { + public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") String query1,@HeaderParam("header_1") String header1) { return Response.ok().entity("magic!").build(); } @@ -95,10 +78,6 @@ public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query @Path("/outer/boolean") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) - }) @Operation(summary = "", description = "Test serialization of outer boolean types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output boolean") @@ -111,10 +90,6 @@ public Response fakeOuterBooleanSerialize(@Valid Boolean body) { @Path("/outer/composite") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) - }) @Operation(summary = "", description = "Test serialization of object with outer number type") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output composite") @@ -127,10 +102,6 @@ public Response fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite @Path("/outer/number") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) - }) @Operation(summary = "", description = "Test serialization of outer number types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output number") @@ -143,10 +114,6 @@ public Response fakeOuterNumberSerialize(@Valid BigDecimal body) { @Path("/outer/string") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output string", response = String.class) - }) @Operation(summary = "", description = "Test serialization of outer string types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output string") @@ -159,10 +126,6 @@ public Response fakeOuterStringSerialize(@Valid String body) { @Path("/property/enum-int") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of enum (int) properties with examples", response = OuterObjectWithEnumProperty.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output enum (int)", response = OuterObjectWithEnumProperty.class) - }) @Operation(summary = "", description = "Test serialization of enum (int) properties with examples") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output enum (int)") @@ -174,10 +137,6 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith @GET @Path("/tests/defaults") @Produces({ "application/json" }) - @ApiOperation(value = "test enum default in request body", notes = "", response = FakeTestsDefaultsDefaultResponse.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "response", response = FakeTestsDefaultsDefaultResponse.class) - }) @Operation(summary = "test enum default in request body", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") @@ -189,10 +148,6 @@ public Response fakeTestsDefaults() { @POST @Path("/additionalProperties-reference") @Consumes({ "application/json" }) - @ApiOperation(value = "test referenced additionalProperties", notes = "", response = Void.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "test referenced additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -204,10 +159,6 @@ public Response testAdditionalPropertiesReference(@Valid @NotNull Map enumHeaderStringArray,@QueryParam("enum_query_string_array") @ApiParam("Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @ApiParam("Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @ApiParam("Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @ApiParam("Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public Response testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@QueryParam("enum_query_string_array") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { return Response.ok().entity("magic!").build(); } @DELETE - @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, authorizations = { - - @Authorization(value = "bearer_test") - }, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Something wrong", response = Void.class) - }) @Operation(summary = "Fake endpoint to test group parameters (optional)", description = "Fake endpoint to test group parameters (optional)") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Something wrong") }) - public Response testGroupParameters(@QueryParam("required_string_group") @NotNull @ApiParam("Required String in group parameters") Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull @ApiParam("Required Integer in group parameters") Long requiredInt64Group,@QueryParam("string_group") @ApiParam("String in group parameters") Integer stringGroup,@HeaderParam("boolean_group") @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group") @ApiParam("Integer in group parameters") Long int64Group) { + public Response testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@QueryParam("string_group") Integer stringGroup,@HeaderParam("boolean_group") Boolean booleanGroup,@QueryParam("int64_group") Long int64Group) { return Response.ok().entity("magic!").build(); } @POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) - @ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "test inline additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -333,10 +245,6 @@ public Response testInlineAdditionalProperties(@Valid @NotNull Map reque @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - @ApiOperation(value = "uploads an image (required)", notes = "", response = ModelApiResponse.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) @Operation(summary = "uploads an image (required)", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index da86f9415030..20831afb6bc5 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -5,7 +5,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,7 +20,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake_classname_test") -@Api(description = "the fake_classname_test API") @Tag(name = "fake_classname_test") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeClassnameTestApi { @@ -29,13 +27,6 @@ public class FakeClassnameTestApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", response = Client.class, authorizations = { - - @Authorization(value = "api_key_query") - }, tags={ "fake_classname_tags 123#$%^" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Client.class) - }) @Operation(summary = "To test class name in snake case", description = "To test class name in snake case") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java index 247099fbddc7..bf9b7977931c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/FooApi.java @@ -5,7 +5,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,17 +20,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/foo") -@Api(description = "the foo API") @Tag(name = "foo") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FooApi { @GET @Produces({ "application/json" }) - @ApiOperation(value = "", notes = "", response = FooGetDefaultResponse.class, tags={ }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "response", response = FooGetDefaultResponse.class) - }) @Operation(summary = "", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java index ce7a822fe757..b07bfbed4b41 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java @@ -8,7 +8,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -24,22 +23,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/pet") -@Api(description = "the pet API") @Tag(name = "pet") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class PetApi { @POST @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 405, message = "Invalid input", response = Void.class) - }) @Operation(summary = "Add a new pet to the store", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -51,104 +40,54 @@ public Response addPet(@Valid @NotNull Pet pet) { @DELETE @Path("/{petId}") - @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @io.swagger.annotations.ApiImplicitParams({ - @io.swagger.annotations.ApiImplicitParam(name = "api_key", value = "", dataType = "String", paramType = "header") - }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) - }) @Operation(summary = "Deletes a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "400", description = "Invalid pet value") }) - public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId) { + public Response deletePet(@PathParam("petId") Long petId) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) - }) @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), - @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) - }) @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") }) - public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags) { + public Response findPetsByTags(@QueryParam("tags") @NotNull Set tags) { return Response.ok().entity("magic!").build(); } @GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { - - @Authorization(value = "api_key") - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Pet not found", response = Void.class) - }) @Operation(summary = "Find pet by ID", description = "Returns a single pet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found") }) - public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") Long petId) { + public Response getPetById(@PathParam("petId") Long petId) { return Response.ok().entity("magic!").build(); } @PUT @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Pet not found", response = Void.class), - @ApiResponse(code = 405, message = "Validation exception", response = Void.class) - }) @Operation(summary = "Update an existing pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -163,21 +102,12 @@ public Response updatePet(@Valid @NotNull Pet pet) { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 405, message = "Invalid input", response = Void.class) - }) @Operation(summary = "Updates a pet in the store with form data", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "405", description = "Invalid input") }) - public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { + public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { return Response.ok().entity("magic!").build(); } @@ -185,19 +115,11 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) @Operation(summary = "uploads an image", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java index 28334d8a647f..9bdd7e83c580 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,7 +6,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -22,37 +21,24 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/store") -@Api(description = "the store API") @Tag(name = "store") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class StoreApi { @DELETE @Path("/order/{order_id}") - @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Order not found", response = Void.class) - }) @Operation(summary = "Delete purchase order by ID", description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response deleteOrder(@PathParam("order_id") @ApiParam("ID of the order that needs to be deleted") String orderId) { + public Response deleteOrder(@PathParam("order_id") String orderId) { return Response.ok().entity("magic!").build(); } @GET @Path("/inventory") @Produces({ "application/json" }) - @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { - - @Authorization(value = "api_key") - }, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") - }) @Operation(summary = "Returns pet inventories by status", description = "Returns a map of status codes to quantities") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -64,19 +50,13 @@ public Response getInventory() { @GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Order not found", response = Void.class) - }) @Operation(summary = "Find purchase order by ID", description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam("ID of pet that needs to be fetched") Long orderId) { + public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long orderId) { return Response.ok().entity("magic!").build(); } @@ -84,11 +64,6 @@ public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam( @Path("/order") @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) - }) @Operation(summary = "Place an order for a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java index 7426e4aa6f06..80fec44e6d4f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/UserApi.java @@ -6,7 +6,6 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -22,17 +21,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/user") -@Api(description = "the user API") @Tag(name = "user") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class UserApi { @POST @Consumes({ "application/json" }) - @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Create user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -44,10 +38,6 @@ public Response createUser(@Valid @NotNull User user) { @POST @Path("/createWithArray") @Consumes({ "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -59,10 +49,6 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @POST @Path("/createWithList") @Consumes({ "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -73,62 +59,42 @@ public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) @DELETE @Path("/{username}") - @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Delete user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username) { + public Response deleteUser(@PathParam("username") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = User.class), - @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Get user by user name", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing.") String username) { + public Response getUserByName(@PathParam("username") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/login") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = String.class), - @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) - }) @Operation(summary = "Logs user into the system", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") }) - public Response loginUser(@QueryParam("username") @NotNull @ApiParam("The user name for login") String username,@QueryParam("password") @NotNull @ApiParam("The password for login in clear text") String password) { + public Response loginUser(@QueryParam("username") @NotNull String username,@QueryParam("password") @NotNull String password) { return Response.ok().entity("magic!").build(); } @GET @Path("/logout") - @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Logs out current logged in user session", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -140,17 +106,12 @@ public Response logoutUser() { @PUT @Path("/{username}") @Consumes({ "application/json" }) - @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Updated user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid @NotNull User user) { + public Response updateUser(@PathParam("username") String username,@Valid @NotNull User user) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 180815aabf85..572a9047c853 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_property") public Map getMapProperty() { @@ -77,7 +73,6 @@ public AdditionalPropertiesClass mapOfMapProperty(Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java index 1a206290261c..17cf3b463527 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.SingleRefType; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public AllOfWithSingleRef username(String username) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -60,7 +56,6 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SingleRefType") public SingleRefType getSingleRefType() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java index d195949e967f..58f03001a091 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Animal.java @@ -3,13 +3,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -54,7 +51,6 @@ public Animal className(String className) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "className") @NotNull public String getClassName() { @@ -74,7 +70,6 @@ public Animal color(String color) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("color") public String getColor() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 0354d5fb01c8..56f450820cdf 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +8,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayArrayNumber") @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 8532833ff9bc..510b41b48cf1 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +8,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayNumber") @Valid public List<@Valid BigDecimal> getArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java index 148be4281c29..c4e3c9f0c461 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -10,7 +8,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,7 +42,6 @@ public ArrayTest arrayOfString(List arrayOfString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_of_string") @Size(min=0,max=3)public List getArrayOfString() { @@ -81,7 +77,6 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -117,7 +112,6 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_model") @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java index 834f6397abb4..1afe1773507f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Capitalization.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -47,7 +44,6 @@ public Capitalization smallCamel(String smallCamel) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("smallCamel") public String getSmallCamel() { @@ -67,7 +63,6 @@ public Capitalization capitalCamel(String capitalCamel) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { @@ -87,7 +82,6 @@ public Capitalization smallSnake(String smallSnake) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("small_Snake") public String getSmallSnake() { @@ -107,7 +101,6 @@ public Capitalization capitalSnake(String capitalSnake) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { @@ -127,7 +120,6 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { @@ -148,7 +140,6 @@ public Capitalization ATT_NAME(String ATT_NAME) { } - @ApiModelProperty(value = "Name of the pet ") @Schema(description = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java index 00901784fee7..a3a1cc80f042 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Cat.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public Cat declawed(Boolean declawed) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java index 8efc87828841..4fdb24f7f44c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Category.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,7 +43,6 @@ public Category id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -66,7 +62,6 @@ public Category name(String name) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java index 3ff1df85ecc9..57097d65fa75 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ChildWithNullable.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.ParentWithNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public ChildWithNullable otherProperty(String otherProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("otherProperty") public String getOtherProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java index 2709cf65b7cb..c3efb9f5891a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +14,7 @@ /** * Model for testing model with \"_class\" property **/ -@ApiModel(description = "Model for testing model with \"_class\" property") + @Schema(description="Model for testing model with \"_class\" property") @JsonTypeName("ClassModel") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -39,7 +36,6 @@ public ClassModel propertyClass(String propertyClass) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("_class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java index 0de4fed21922..200395b16f58 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Client.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public Client client(String client) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("client") public String getClient() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java index c6b4ffa0173f..e316c80794c8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public DeprecatedObject name(String name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java index 9adfb971681f..fd0386dd4e50 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Dog.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public Dog breed(String breed) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java index 89ab2672434c..393f627ed9bd 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -9,7 +7,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -136,7 +133,6 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { @@ -156,7 +152,6 @@ public EnumArrays arrayEnum(List arrayEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_enum") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java index 36e1839edfc6..9e49ad8e7060 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/EnumTest.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.OuterEnum; import org.openapitools.model.OuterEnumDefaultValue; @@ -12,7 +10,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -252,7 +249,6 @@ public EnumTest enumString(EnumStringEnum enumString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { @@ -272,7 +268,6 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "enum_string_required") @NotNull public EnumStringRequiredEnum getEnumStringRequired() { @@ -292,7 +287,6 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { @@ -312,7 +306,6 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { @@ -332,7 +325,6 @@ public EnumTest outerEnum(OuterEnum outerEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { @@ -352,7 +344,6 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumInteger") public OuterEnumInteger getOuterEnumInteger() { @@ -372,7 +363,6 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumDefaultValue") public OuterEnumDefaultValue getOuterEnumDefaultValue() { @@ -392,7 +382,6 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumIntegerDefaultValue") public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 081ca1f15903..3e1be0fc9cb1 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -10,7 +8,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +40,6 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someId") @Valid public BigDecimal getSomeId() { @@ -63,7 +59,6 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someMap") @Valid public Map getSomeMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java index 6208e38986c7..04b9f8e8cfbe 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java @@ -1,15 +1,12 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.IntegerEnum; import org.openapitools.model.StringEnum; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -140,7 +137,6 @@ public FakeTestsDefaultsDefaultResponse stringEnum(StringEnum stringEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnum") public StringEnum getStringEnum() { @@ -160,7 +156,6 @@ public FakeTestsDefaultsDefaultResponse integerEnum(IntegerEnum integerEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnum") public IntegerEnum getIntegerEnum() { @@ -180,7 +175,6 @@ public FakeTestsDefaultsDefaultResponse stringEnumInline(StringEnumInlineEnum st } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnumInline") public StringEnumInlineEnum getStringEnumInline() { @@ -200,7 +194,6 @@ public FakeTestsDefaultsDefaultResponse integerEnumInline(IntegerEnumInlineEnum } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnumInline") public IntegerEnumInlineEnum getIntegerEnumInline() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index aebabb6fbead..28ee5c23b271 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -10,7 +8,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +40,6 @@ public FileSchemaTestClass _file(ModelFile _file) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("file") @Valid public ModelFile getFile() { @@ -63,7 +59,6 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("files") @Valid public List<@Valid ModelFile> getFiles() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java index 7c0a18a908a8..a7a3387c5593 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Foo.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public Foo bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java index 3a73ef03278b..c08f51b6ac1a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java @@ -1,14 +1,11 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Foo; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public FooGetDefaultResponse string(Foo string) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Valid public Foo getString() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java index 3423f5cb7303..4b778c9dff4f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/FormatTest.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -13,7 +11,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -89,7 +86,6 @@ public FormatTest integer(Integer integer) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer") @Min(10) @Max(100)public Integer getInteger() { @@ -111,7 +107,6 @@ public FormatTest int32(Integer int32) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int32") @Min(20) @Max(200)public Integer getInt32() { @@ -131,7 +126,6 @@ public FormatTest int64(Long int64) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int64") public Long getInt64() { @@ -153,7 +147,6 @@ public FormatTest number(BigDecimal number) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { @@ -175,7 +168,6 @@ public FormatTest _float(Float _float) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { @@ -197,7 +189,6 @@ public FormatTest _double(Double _double) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { @@ -217,7 +208,6 @@ public FormatTest decimal(BigDecimal decimal) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("decimal") @Valid public BigDecimal getDecimal() { @@ -237,7 +227,6 @@ public FormatTest string(String string) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i")public String getString() { @@ -257,7 +246,6 @@ public FormatTest _byte(byte[] _byte) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "byte") @NotNull public byte[] getByte() { @@ -277,7 +265,6 @@ public FormatTest binary(File binary) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("binary") public File getBinary() { @@ -297,7 +284,6 @@ public FormatTest date(LocalDate date) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "date") @NotNull public LocalDate getDate() { @@ -317,7 +303,6 @@ public FormatTest dateTime(Date dateTime) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -337,7 +322,6 @@ public FormatTest uuid(UUID uuid) { } - @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -357,7 +341,6 @@ public FormatTest password(String password) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "password") @NotNull @Size(min=10,max=64)public String getPassword() { @@ -378,7 +361,6 @@ public FormatTest patternWithDigits(String patternWithDigits) { } - @ApiModelProperty(value = "A string that is a 10 digit number. Can have leading zeros.") @Schema(description = "A string that is a 10 digit number. Can have leading zeros.") @JsonProperty("pattern_with_digits") @Pattern(regexp="^\\d{10}$")public String getPatternWithDigits() { @@ -399,7 +381,6 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim } - @ApiModelProperty(value = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @Schema(description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @JsonProperty("pattern_with_digits_and_delimiter") @Pattern(regexp="/^image_\\d{1,3}$/i")public String getPatternWithDigitsAndDelimiter() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 69c894f8d861..097f215e4002 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public HasOnlyReadOnly bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -60,7 +56,6 @@ public HasOnlyReadOnly foo(String foo) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("foo") public String getFoo() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java index 98b0a97f2fe4..7239283a0895 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/HealthCheckResult.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. **/ -@ApiModel(description = "Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") + @Schema(description="Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @JsonTypeName("HealthCheckResult") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -40,7 +37,6 @@ public HealthCheckResult nullableMessage(String nullableMessage) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("NullableMessage") public String getNullableMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java index 63ccefa84243..4ff129e77d26 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MapTest.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -92,7 +89,6 @@ public MapTest mapMapOfString(Map> mapMapOfString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { @@ -128,7 +124,6 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { @@ -164,7 +159,6 @@ public MapTest directMap(Map directMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("direct_map") public Map getDirectMap() { @@ -200,7 +194,6 @@ public MapTest indirectMap(Map indirectMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("indirect_map") public Map getIndirectMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9d2d0b005343..83520d738599 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -11,7 +9,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,7 +43,6 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -66,7 +62,6 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -86,7 +81,6 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map") @Valid public Map getMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java index bc9fbfb5b600..1ee640912918 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Model for testing model name starting with number **/ -@ApiModel(description = "Model for testing model name starting with number") + @Schema(description="Model for testing model name starting with number") @JsonTypeName("200_response") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -42,7 +39,6 @@ public Model200Response name(Integer name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public Integer getName() { @@ -62,7 +58,6 @@ public Model200Response propertyClass(String propertyClass) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java index bcbcc5f80d1a..ba8efa0a16a1 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,7 +39,6 @@ public ModelApiResponse code(Integer code) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("code") public Integer getCode() { @@ -62,7 +58,6 @@ public ModelApiResponse type(String type) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public String getType() { @@ -82,7 +77,6 @@ public ModelApiResponse message(String message) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("message") public String getMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java index bf99888b7302..f813e6b9c2fe 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelFile.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Must be named `File` for test. **/ -@ApiModel(description = "Must be named `File` for test.") + @Schema(description="Must be named `File` for test.") @JsonTypeName("File") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -41,7 +38,6 @@ public ModelFile sourceURI(String sourceURI) { } - @ApiModelProperty(value = "Test capitalization") @Schema(description = "Test capitalization") @JsonProperty("sourceURI") public String getSourceURI() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java index 5738bb6f82d9..715a840e82d9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelList.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public ModelList _123list(String _123list) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123-list") public String get123list() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java index f417484a9045..6382984af112 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Model for testing reserved words **/ -@ApiModel(description = "Model for testing reserved words") + @Schema(description="Model for testing reserved words") @JsonTypeName("Return") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -40,7 +37,6 @@ public ModelReturn _return(Integer _return) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("return") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java index 90bcc66c7944..3e3abc2fa325 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Name.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +14,7 @@ /** * Model for testing model name same as property name **/ -@ApiModel(description = "Model for testing model name same as property name") + @Schema(description="Model for testing model name same as property name") @JsonTypeName("Name") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -52,7 +49,6 @@ public Name name(Integer name) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public Integer getName() { @@ -72,7 +68,6 @@ public Name snakeCase(Integer snakeCase) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("snake_case") public Integer getSnakeCase() { @@ -92,7 +87,6 @@ public Name property(String property) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("property") public String getProperty() { @@ -112,7 +106,6 @@ public Name _123number(Integer _123number) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123Number") public Integer get123number() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java index f918e4e706b3..4d131695e54b 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NullableClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -15,7 +13,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -53,7 +50,6 @@ public NullableClass integerProp(Integer integerProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer_prop") public Integer getIntegerProp() { @@ -73,7 +69,6 @@ public NullableClass numberProp(BigDecimal numberProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("number_prop") @Valid public BigDecimal getNumberProp() { @@ -93,7 +88,6 @@ public NullableClass booleanProp(Boolean booleanProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("boolean_prop") public Boolean getBooleanProp() { @@ -113,7 +107,6 @@ public NullableClass stringProp(String stringProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string_prop") public String getStringProp() { @@ -133,7 +126,6 @@ public NullableClass dateProp(LocalDate dateProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("date_prop") public LocalDate getDateProp() { @@ -153,7 +145,6 @@ public NullableClass datetimeProp(Date datetimeProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("datetime_prop") public Date getDatetimeProp() { @@ -173,7 +164,6 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_nullable_prop") public List getArrayNullableProp() { @@ -209,7 +199,6 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_and_items_nullable_prop") public List getArrayAndItemsNullableProp() { @@ -245,7 +234,6 @@ public NullableClass arrayItemsNullable(List arrayItemsNullable) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_items_nullable") public List getArrayItemsNullable() { @@ -281,7 +269,6 @@ public NullableClass objectNullableProp(Map objectNullableProp) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_nullable_prop") public Map getObjectNullableProp() { @@ -317,7 +304,6 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_and_items_nullable_prop") public Map getObjectAndItemsNullableProp() { @@ -353,7 +339,6 @@ public NullableClass objectItemsNullable(Map objectItemsNullable } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_items_nullable") public Map getObjectItemsNullable() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java index c3c41e71bda7..75e682baf206 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public NumberOnly justNumber(BigDecimal justNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("JustNumber") @Valid public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index b4e8cbd5d96a..849a00776b54 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -11,7 +9,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public ObjectWithDeprecatedFields uuid(String uuid) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public String getUuid() { @@ -68,7 +64,6 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") @Valid public BigDecimal getId() { @@ -88,7 +83,6 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { @@ -108,7 +102,6 @@ public ObjectWithDeprecatedFields bars(List bars) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bars") public List getBars() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java index 6d3d2b93ad74..887639544ff0 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Order.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -95,7 +92,6 @@ public Order id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -115,7 +111,6 @@ public Order petId(Long petId) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("petId") public Long getPetId() { @@ -135,7 +130,6 @@ public Order quantity(Integer quantity) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -155,7 +149,6 @@ public Order shipDate(Date shipDate) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -176,7 +169,6 @@ public Order status(StatusEnum status) { } - @ApiModelProperty(value = "Order Status") @Schema(description = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -196,7 +188,6 @@ public Order complete(Boolean complete) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java index 3a2e430040dd..4252a318c02e 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,7 +39,6 @@ public OuterComposite myNumber(BigDecimal myNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_number") @Valid public BigDecimal getMyNumber() { @@ -62,7 +58,6 @@ public OuterComposite myString(String myString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_string") public String getMyString() { @@ -82,7 +77,6 @@ public OuterComposite myBoolean(Boolean myBoolean) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_boolean") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java index a0de4bd3221e..8f9c2b9eb2c9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnumInteger; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,7 +42,6 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "value") @NotNull public OuterEnumInteger getValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java index 5b131d5ed530..0204c0dbf136 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -3,14 +3,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -94,7 +91,6 @@ public ParentWithNullable type(TypeEnum type) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public TypeEnum getType() { @@ -114,7 +110,6 @@ public ParentWithNullable nullableProperty(String nullableProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("nullableProperty") public String getNullableProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java index 61256c6a2aeb..6e8fe3cb22a6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Pet.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -14,7 +12,6 @@ import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -111,7 +108,6 @@ public Pet id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -131,7 +127,6 @@ public Pet category(Category category) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("category") @Valid public Category getCategory() { @@ -151,7 +146,6 @@ public Pet name(String name) { } - @ApiModelProperty(example = "doggie", required = true, value = "") @Schema(example = "doggie", required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { @@ -171,7 +165,6 @@ public Pet photoUrls(Set photoUrls) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "photoUrls") @NotNull public Set getPhotoUrls() { @@ -208,7 +201,6 @@ public Pet tags(List<@Valid Tag> tags) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("tags") @Valid public List<@Valid Tag> getTags() { @@ -245,7 +237,6 @@ public Pet status(StatusEnum status) { } - @ApiModelProperty(value = "pet status in the store") @Schema(description = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index a4f5e610578a..df92ae9af53c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public ReadOnlyFirst bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -59,7 +55,6 @@ public ReadOnlyFirst baz(String baz) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("baz") public String getBaz() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java index aabc23881594..88f1e41fc8b0 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public SpecialModelName() { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java index 47c7d33ff400..e94bf00580af 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/Tag.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public Tag id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -59,7 +55,6 @@ public Tag name(String name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java index f71f8c0c8787..c68f26ff2c58 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -1,15 +1,12 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,7 +33,6 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someProperty") public String getSomeProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java index b6fe8c83358f..1cf8c6524290 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/User.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import jakarta.validation.constraints.*; import jakarta.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -51,7 +48,6 @@ public User id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -71,7 +67,6 @@ public User username(String username) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -91,7 +86,6 @@ public User firstName(String firstName) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("firstName") public String getFirstName() { @@ -111,7 +105,6 @@ public User lastName(String lastName) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("lastName") public String getLastName() { @@ -131,7 +124,6 @@ public User email(String email) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("email") public String getEmail() { @@ -151,7 +143,6 @@ public User password(String password) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("password") public String getPassword() { @@ -171,7 +162,6 @@ public User phone(String phone) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("phone") public String getPhone() { @@ -192,7 +182,6 @@ public User userStatus(Integer userStatus) { } - @ApiModelProperty(value = "User Status") @Schema(description = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml index 387705be3d0e..bda392827e61 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/pom.xml @@ -78,12 +78,6 @@ javax.annotation-api ${javax.annotation-api-version} - - io.swagger - swagger-annotations - provided - 1.5.3 - io.swagger.core.v3 swagger-annotations diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 073443d29010..ee0fc23ec292 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -5,7 +5,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,7 +20,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/another-fake/dummy") -@Api(description = "the another-fake API") @Tag(name = "another-fake") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class AnotherFakeApi { @@ -29,10 +27,6 @@ public class AnotherFakeApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Client.class) - }) @Operation(summary = "To test special tags", description = "To test special tags and operation ID starting with number") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java index 8d273989c783..1859eee64c03 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -22,7 +22,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -38,7 +37,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake") -@Api(description = "the fake API") @Tag(name = "fake") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeApi { @@ -46,10 +44,6 @@ public class FakeApi { @GET @Path("/BigDecimalMap") @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys", response = FakeBigDecimalMap200Response.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = FakeBigDecimalMap200Response.class) - }) @Operation(summary = "", description = "for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -61,10 +55,6 @@ public Response fakeBigDecimalMap() { @GET @Path("/health") @Produces({ "application/json" }) - @ApiOperation(value = "Health check endpoint", notes = "", response = HealthCheckResult.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "The instance started successfully", response = HealthCheckResult.class) - }) @Operation(summary = "Health check endpoint", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") @@ -76,18 +66,11 @@ public Response fakeHealthGet() { @GET @Path("/http-signature-test") @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "test http signature authentication", notes = "", response = Void.class, authorizations = { - - @Authorization(value = "http_signature_test") - }, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "The instance started successfully", response = Void.class) - }) @Operation(summary = "test http signature authentication", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "The instance started successfully") }) - public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") @ApiParam("query parameter") String query1,@HeaderParam("header_1") @ApiParam("header parameter") String header1) { + public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query_1") String query1,@HeaderParam("header_1") String header1) { return Response.ok().entity("magic!").build(); } @@ -95,10 +78,6 @@ public Response fakeHttpSignatureTest(@Valid @NotNull Pet pet,@QueryParam("query @Path("/outer/boolean") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) - }) @Operation(summary = "", description = "Test serialization of outer boolean types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output boolean") @@ -111,10 +90,6 @@ public Response fakeOuterBooleanSerialize(@Valid Boolean body) { @Path("/outer/composite") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) - }) @Operation(summary = "", description = "Test serialization of object with outer number type") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output composite") @@ -127,10 +102,6 @@ public Response fakeOuterCompositeSerialize(@Valid OuterComposite outerComposite @Path("/outer/number") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) - }) @Operation(summary = "", description = "Test serialization of outer number types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output number") @@ -143,10 +114,6 @@ public Response fakeOuterNumberSerialize(@Valid BigDecimal body) { @Path("/outer/string") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output string", response = String.class) - }) @Operation(summary = "", description = "Test serialization of outer string types") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output string") @@ -159,10 +126,6 @@ public Response fakeOuterStringSerialize(@Valid String body) { @Path("/property/enum-int") @Consumes({ "application/json" }) @Produces({ "*/*" }) - @ApiOperation(value = "", notes = "Test serialization of enum (int) properties with examples", response = OuterObjectWithEnumProperty.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Output enum (int)", response = OuterObjectWithEnumProperty.class) - }) @Operation(summary = "", description = "Test serialization of enum (int) properties with examples") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Output enum (int)") @@ -174,10 +137,6 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith @GET @Path("/tests/defaults") @Produces({ "application/json" }) - @ApiOperation(value = "test enum default in request body", notes = "", response = FakeTestsDefaultsDefaultResponse.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "response", response = FakeTestsDefaultsDefaultResponse.class) - }) @Operation(summary = "test enum default in request body", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") @@ -189,10 +148,6 @@ public Response fakeTestsDefaults() { @POST @Path("/additionalProperties-reference") @Consumes({ "application/json" }) - @ApiOperation(value = "test referenced additionalProperties", notes = "", response = Void.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "test referenced additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -204,10 +159,6 @@ public Response testAdditionalPropertiesReference(@Valid @NotNull Map enumHeaderStringArray,@QueryParam("enum_query_string_array") @ApiParam("Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @ApiParam("Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @ApiParam("Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @ApiParam("Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public Response testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@QueryParam("enum_query_string_array") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { return Response.ok().entity("magic!").build(); } @DELETE - @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, authorizations = { - - @Authorization(value = "bearer_test") - }, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Something wrong", response = Void.class) - }) @Operation(summary = "Fake endpoint to test group parameters (optional)", description = "Fake endpoint to test group parameters (optional)") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Something wrong") }) - public Response testGroupParameters(@QueryParam("required_string_group") @NotNull @ApiParam("Required String in group parameters") Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull @ApiParam("Required Integer in group parameters") Long requiredInt64Group,@QueryParam("string_group") @ApiParam("String in group parameters") Integer stringGroup,@HeaderParam("boolean_group") @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group") @ApiParam("Integer in group parameters") Long int64Group) { + public Response testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@QueryParam("string_group") Integer stringGroup,@HeaderParam("boolean_group") Boolean booleanGroup,@QueryParam("int64_group") Long int64Group) { return Response.ok().entity("magic!").build(); } @POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) - @ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "test inline additionalProperties", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -333,10 +245,6 @@ public Response testInlineAdditionalProperties(@Valid @NotNull Map reque @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - @ApiOperation(value = "uploads an image (required)", notes = "", response = ModelApiResponse.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) @Operation(summary = "uploads an image (required)", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 9324dd47118f..6a476f5f40dc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -5,7 +5,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,7 +20,6 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/fake_classname_test") -@Api(description = "the fake_classname_test API") @Tag(name = "fake_classname_test") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FakeClassnameTestApi { @@ -29,13 +27,6 @@ public class FakeClassnameTestApi { @PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", response = Client.class, authorizations = { - - @Authorization(value = "api_key_query") - }, tags={ "fake_classname_tags 123#$%^" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Client.class) - }) @Operation(summary = "To test class name in snake case", description = "To test class name in snake case") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java index 6138354326f0..7a594b4a26a4 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/FooApi.java @@ -5,7 +5,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -21,17 +20,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/foo") -@Api(description = "the foo API") @Tag(name = "foo") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class FooApi { @GET @Produces({ "application/json" }) - @ApiOperation(value = "", notes = "", response = FooGetDefaultResponse.class, tags={ }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "response", response = FooGetDefaultResponse.class) - }) @Operation(summary = "", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "response") diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java index 3f72e1e42273..d21d38c0b624 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java @@ -8,7 +8,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -24,22 +23,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/pet") -@Api(description = "the pet API") @Tag(name = "pet") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class PetApi { @POST @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 405, message = "Invalid input", response = Void.class) - }) @Operation(summary = "Add a new pet to the store", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -51,104 +40,54 @@ public Response addPet(@Valid @NotNull Pet pet) { @DELETE @Path("/{petId}") - @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @io.swagger.annotations.ApiImplicitParams({ - @io.swagger.annotations.ApiImplicitParam(name = "api_key", value = "", dataType = "String", paramType = "header") - }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) - }) @Operation(summary = "Deletes a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "400", description = "Invalid pet value") }) - public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId) { + public Response deletePet(@PathParam("petId") Long petId) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) - }) @Operation(summary = "Finds Pets by status", description = "Multiple status values can be provided with comma separated strings") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { return Response.ok().entity("magic!").build(); } @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), - @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) - }) @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") }) - public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags) { + public Response findPetsByTags(@QueryParam("tags") @NotNull Set tags) { return Response.ok().entity("magic!").build(); } @GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", response = Pet.class, authorizations = { - - @Authorization(value = "api_key") - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Pet not found", response = Void.class) - }) @Operation(summary = "Find pet by ID", description = "Returns a single pet") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Pet not found") }) - public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") Long petId) { + public Response getPetById(@PathParam("petId") Long petId) { return Response.ok().entity("magic!").build(); } @PUT @Consumes({ "application/json", "application/xml" }) - @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Pet not found", response = Void.class), - @ApiResponse(code = 405, message = "Validation exception", response = Void.class) - }) @Operation(summary = "Update an existing pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @@ -163,21 +102,12 @@ public Response updatePet(@Valid @NotNull Pet pet) { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "Successful operation", response = Void.class), - @ApiResponse(code = 405, message = "Invalid input", response = Void.class) - }) @Operation(summary = "Updates a pet in the store with form data", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Successful operation"), @ApiResponse(responseCode = "405", description = "Invalid input") }) - public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { + public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { return Response.ok().entity("magic!").build(); } @@ -185,19 +115,11 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - @ApiOperation(value = "uploads an image", notes = "", response = ModelApiResponse.class, authorizations = { - @Authorization(value = "petstore_auth", scopes = { - @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), - @AuthorizationScope(scope = "read:pets", description = "read your pets") }) - }, tags={ "pet" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) - }) @Operation(summary = "uploads an image", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") }) - public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java index e1a2ea6660f6..fd6b095a212a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/StoreApi.java @@ -6,7 +6,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -22,37 +21,24 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/store") -@Api(description = "the store API") @Tag(name = "store") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class StoreApi { @DELETE @Path("/order/{order_id}") - @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Order not found", response = Void.class) - }) @Operation(summary = "Delete purchase order by ID", description = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response deleteOrder(@PathParam("order_id") @ApiParam("ID of the order that needs to be deleted") String orderId) { + public Response deleteOrder(@PathParam("order_id") String orderId) { return Response.ok().entity("magic!").build(); } @GET @Path("/inventory") @Produces({ "application/json" }) - @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = { - - @Authorization(value = "api_key") - }, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") - }) @Operation(summary = "Returns pet inventories by status", description = "Returns a map of status codes to quantities") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -64,19 +50,13 @@ public Response getInventory() { @GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions", response = Order.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class), - @ApiResponse(code = 404, message = "Order not found", response = Void.class) - }) @Operation(summary = "Find purchase order by ID", description = "For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid ID supplied"), @ApiResponse(responseCode = "404", description = "Order not found") }) - public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam("ID of pet that needs to be fetched") Long orderId) { + public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) Long orderId) { return Response.ok().entity("magic!").build(); } @@ -84,11 +64,6 @@ public Response getOrderById(@PathParam("order_id") @Min(1L) @Max(5L) @ApiParam( @Path("/order") @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class, tags={ "store" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Order.class), - @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) - }) @Operation(summary = "Place an order for a pet", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java index 312d7dce0e80..4717e56539d9 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/UserApi.java @@ -6,7 +6,6 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.*; import io.swagger.v3.oas.annotations.media.*; import io.swagger.v3.oas.annotations.responses.*; @@ -22,17 +21,12 @@ * Represents a collection of functions to interact with the API endpoints. */ @Path("/user") -@Api(description = "the user API") @Tag(name = "user") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") public class UserApi { @POST @Consumes({ "application/json" }) - @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Create user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -44,10 +38,6 @@ public Response createUser(@Valid @NotNull User user) { @POST @Path("/createWithArray") @Consumes({ "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -59,10 +49,6 @@ public Response createUsersWithArrayInput(@Valid @NotNull List<@Valid User> user @POST @Path("/createWithList") @Consumes({ "application/json" }) - @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Creates list of users with given input array", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -73,62 +59,42 @@ public Response createUsersWithListInput(@Valid @NotNull List<@Valid User> user) @DELETE @Path("/{username}") - @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Delete user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username) { + public Response deleteUser(@PathParam("username") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Get user by user name", notes = "", response = User.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = User.class), - @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Get user by user name", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing.") String username) { + public Response getUserByName(@PathParam("username") String username) { return Response.ok().entity("magic!").build(); } @GET @Path("/login") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Logs user into the system", notes = "", response = String.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = String.class), - @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) - }) @Operation(summary = "Logs user into the system", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid username/password supplied") }) - public Response loginUser(@QueryParam("username") @NotNull @ApiParam("The user name for login") String username,@QueryParam("password") @NotNull @ApiParam("The password for login in clear text") String password) { + public Response loginUser(@QueryParam("username") @NotNull String username,@QueryParam("password") @NotNull String password) { return Response.ok().entity("magic!").build(); } @GET @Path("/logout") - @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Void.class) - }) @Operation(summary = "Logs out current logged in user session", description = "") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation") @@ -140,17 +106,12 @@ public Response logoutUser() { @PUT @Path("/{username}") @Consumes({ "application/json" }) - @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user" }) - @ApiResponses(value = { - @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class), - @ApiResponse(code = 404, message = "User not found", response = Void.class) - }) @Operation(summary = "Updated user", description = "This can only be done by the logged in user.") @ApiResponses(value = { @ApiResponse(responseCode = "400", description = "Invalid user supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid @NotNull User user) { + public Response updateUser(@PathParam("username") String username,@Valid @NotNull User user) { return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 49027a0d5486..09556eb4391a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_property") public Map getMapProperty() { @@ -77,7 +73,6 @@ public AdditionalPropertiesClass mapOfMapProperty(Map> getMapOfMapProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java index 33fcf8ddde3f..9a9d2013d449 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.SingleRefType; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public AllOfWithSingleRef username(String username) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -60,7 +56,6 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SingleRefType") public SingleRefType getSingleRefType() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java index ac9dc4c51b45..c531dafe3d43 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Animal.java @@ -3,13 +3,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -54,7 +51,6 @@ public Animal className(String className) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "className") @NotNull public String getClassName() { @@ -74,7 +70,6 @@ public Animal color(String color) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("color") public String getColor() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index d810a52d1d09..847d3bbb882d 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +8,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayArrayNumber") @Valid public List<@Valid List<@Valid BigDecimal>> getArrayArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 9829ce6f91ba..29ea779583ad 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -10,7 +8,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -41,7 +38,6 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("ArrayNumber") @Valid public List<@Valid BigDecimal> getArrayNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java index 9baac0941d7b..6e6e9d3dd2fc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ArrayTest.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -10,7 +8,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,7 +42,6 @@ public ArrayTest arrayOfString(List arrayOfString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_of_string") @Size(min=0,max=3)public List getArrayOfString() { @@ -81,7 +77,6 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { @@ -117,7 +112,6 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOf } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_array_of_model") @Valid public List<@Valid List<@Valid ReadOnlyFirst>> getArrayArrayOfModel() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java index 4477def91999..9ea63b2d30b2 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Capitalization.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -47,7 +44,6 @@ public Capitalization smallCamel(String smallCamel) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("smallCamel") public String getSmallCamel() { @@ -67,7 +63,6 @@ public Capitalization capitalCamel(String capitalCamel) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("CapitalCamel") public String getCapitalCamel() { @@ -87,7 +82,6 @@ public Capitalization smallSnake(String smallSnake) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("small_Snake") public String getSmallSnake() { @@ -107,7 +101,6 @@ public Capitalization capitalSnake(String capitalSnake) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("Capital_Snake") public String getCapitalSnake() { @@ -127,7 +120,6 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { @@ -148,7 +140,6 @@ public Capitalization ATT_NAME(String ATT_NAME) { } - @ApiModelProperty(value = "Name of the pet ") @Schema(description = "Name of the pet ") @JsonProperty("ATT_NAME") public String getATTNAME() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java index acedda1ee800..dcb069429389 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Cat.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public Cat declawed(Boolean declawed) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("declawed") public Boolean getDeclawed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java index 590cbae499a8..28e68450d531 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Category.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,7 +43,6 @@ public Category id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -66,7 +62,6 @@ public Category name(String name) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java index 1dbf1747eae9..8f15e6f0df51 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ChildWithNullable.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.ParentWithNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public ChildWithNullable otherProperty(String otherProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("otherProperty") public String getOtherProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java index 151bc9c7cbd6..65b40894b7e2 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +14,7 @@ /** * Model for testing model with \"_class\" property **/ -@ApiModel(description = "Model for testing model with \"_class\" property") + @Schema(description="Model for testing model with \"_class\" property") @JsonTypeName("ClassModel") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -39,7 +36,6 @@ public ClassModel propertyClass(String propertyClass) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("_class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java index d281d724f0db..2002b99e32ca 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Client.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public Client client(String client) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("client") public String getClient() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java index 052315b936e9..d46a439df2f6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public DeprecatedObject name(String name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java index 6deb37b45f4f..e4dad61f7a19 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Dog.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Animal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public Dog breed(String breed) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("breed") public String getBreed() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java index ad6da41186a4..cca78144e5e6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumArrays.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -9,7 +7,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -136,7 +133,6 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { @@ -156,7 +152,6 @@ public EnumArrays arrayEnum(List arrayEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_enum") public List getArrayEnum() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java index b814bbf151f4..d1774f19ef5f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/EnumTest.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import org.openapitools.model.OuterEnum; import org.openapitools.model.OuterEnumDefaultValue; @@ -12,7 +10,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -252,7 +249,6 @@ public EnumTest enumString(EnumStringEnum enumString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_string") public EnumStringEnum getEnumString() { @@ -272,7 +268,6 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "enum_string_required") @NotNull public EnumStringRequiredEnum getEnumStringRequired() { @@ -292,7 +287,6 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { @@ -312,7 +306,6 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { @@ -332,7 +325,6 @@ public EnumTest outerEnum(OuterEnum outerEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { @@ -352,7 +344,6 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumInteger") public OuterEnumInteger getOuterEnumInteger() { @@ -372,7 +363,6 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumDefaultValue") public OuterEnumDefaultValue getOuterEnumDefaultValue() { @@ -392,7 +382,6 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("outerEnumIntegerDefaultValue") public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java index 71e0b5be41e9..aafda9f9fe9c 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -10,7 +8,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +40,6 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someId") @Valid public BigDecimal getSomeId() { @@ -63,7 +59,6 @@ public FakeBigDecimalMap200Response someMap(Map someMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someMap") @Valid public Map getSomeMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java index db1276790c3d..3d236bb4b425 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java @@ -1,15 +1,12 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.IntegerEnum; import org.openapitools.model.StringEnum; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -140,7 +137,6 @@ public FakeTestsDefaultsDefaultResponse stringEnum(StringEnum stringEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnum") public StringEnum getStringEnum() { @@ -160,7 +156,6 @@ public FakeTestsDefaultsDefaultResponse integerEnum(IntegerEnum integerEnum) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnum") public IntegerEnum getIntegerEnum() { @@ -180,7 +175,6 @@ public FakeTestsDefaultsDefaultResponse stringEnumInline(StringEnumInlineEnum st } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("stringEnumInline") public StringEnumInlineEnum getStringEnumInline() { @@ -200,7 +194,6 @@ public FakeTestsDefaultsDefaultResponse integerEnumInline(IntegerEnumInlineEnum } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integerEnumInline") public IntegerEnumInlineEnum getIntegerEnumInline() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index d5b5faafb1d8..b0808a981f93 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -10,7 +8,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +40,6 @@ public FileSchemaTestClass _file(ModelFile _file) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("file") @Valid public ModelFile getFile() { @@ -63,7 +59,6 @@ public FileSchemaTestClass files(List<@Valid ModelFile> files) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("files") @Valid public List<@Valid ModelFile> getFiles() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java index 96fb78510558..e999fb79b983 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Foo.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -37,7 +34,6 @@ public Foo bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java index 7916e0d2e2ef..b4fbcdd7c0dc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java @@ -1,14 +1,11 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.Foo; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public FooGetDefaultResponse string(Foo string) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Valid public Foo getString() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java index 037aa2bf95c5..467a85e0a423 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/FormatTest.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.File; import java.math.BigDecimal; import java.util.Arrays; @@ -13,7 +11,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -89,7 +86,6 @@ public FormatTest integer(Integer integer) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer") @Min(10) @Max(100)public Integer getInteger() { @@ -111,7 +107,6 @@ public FormatTest int32(Integer int32) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int32") @Min(20) @Max(200)public Integer getInt32() { @@ -131,7 +126,6 @@ public FormatTest int64(Long int64) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("int64") public Long getInt64() { @@ -153,7 +147,6 @@ public FormatTest number(BigDecimal number) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "number") @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")public BigDecimal getNumber() { @@ -175,7 +168,6 @@ public FormatTest _float(Float _float) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6")public Float getFloat() { @@ -197,7 +189,6 @@ public FormatTest _double(Double _double) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4")public Double getDouble() { @@ -217,7 +208,6 @@ public FormatTest decimal(BigDecimal decimal) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("decimal") @Valid public BigDecimal getDecimal() { @@ -237,7 +227,6 @@ public FormatTest string(String string) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string") @Pattern(regexp="/[a-z]/i")public String getString() { @@ -257,7 +246,6 @@ public FormatTest _byte(byte[] _byte) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "byte") @NotNull public byte[] getByte() { @@ -277,7 +265,6 @@ public FormatTest binary(File binary) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("binary") public File getBinary() { @@ -297,7 +284,6 @@ public FormatTest date(LocalDate date) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "date") @NotNull public LocalDate getDate() { @@ -317,7 +303,6 @@ public FormatTest dateTime(Date dateTime) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -337,7 +322,6 @@ public FormatTest uuid(UUID uuid) { } - @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -357,7 +341,6 @@ public FormatTest password(String password) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "password") @NotNull @Size(min=10,max=64)public String getPassword() { @@ -378,7 +361,6 @@ public FormatTest patternWithDigits(String patternWithDigits) { } - @ApiModelProperty(value = "A string that is a 10 digit number. Can have leading zeros.") @Schema(description = "A string that is a 10 digit number. Can have leading zeros.") @JsonProperty("pattern_with_digits") @Pattern(regexp="^\\d{10}$")public String getPatternWithDigits() { @@ -399,7 +381,6 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim } - @ApiModelProperty(value = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @Schema(description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.") @JsonProperty("pattern_with_digits_and_delimiter") @Pattern(regexp="/^image_\\d{1,3}$/i")public String getPatternWithDigitsAndDelimiter() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index 9178293d72fb..04b430103b61 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -40,7 +37,6 @@ public HasOnlyReadOnly bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -60,7 +56,6 @@ public HasOnlyReadOnly foo(String foo) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("foo") public String getFoo() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java index b612975caead..c3faaee75882 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/HealthCheckResult.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. **/ -@ApiModel(description = "Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") + @Schema(description="Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.") @JsonTypeName("HealthCheckResult") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -40,7 +37,6 @@ public HealthCheckResult nullableMessage(String nullableMessage) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("NullableMessage") public String getNullableMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java index 699cd8d699bb..d2c47955a0d2 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MapTest.java @@ -1,14 +1,11 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -92,7 +89,6 @@ public MapTest mapMapOfString(Map> mapMapOfString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { @@ -128,7 +124,6 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { @@ -164,7 +159,6 @@ public MapTest directMap(Map directMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("direct_map") public Map getDirectMap() { @@ -200,7 +194,6 @@ public MapTest indirectMap(Map indirectMap) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("indirect_map") public Map getIndirectMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 154be655dc71..7794077e6950 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -11,7 +9,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -46,7 +43,6 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public UUID getUuid() { @@ -66,7 +62,6 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("dateTime") public Date getDateTime() { @@ -86,7 +81,6 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("map") @Valid public Map getMap() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java index 1a161fa0846d..db2848fd996f 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Model for testing model name starting with number **/ -@ApiModel(description = "Model for testing model name starting with number") + @Schema(description="Model for testing model name starting with number") @JsonTypeName("200_response") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -42,7 +39,6 @@ public Model200Response name(Integer name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public Integer getName() { @@ -62,7 +58,6 @@ public Model200Response propertyClass(String propertyClass) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("class") public String getPropertyClass() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java index 5fb56323f379..3512064eebc5 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,7 +39,6 @@ public ModelApiResponse code(Integer code) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("code") public Integer getCode() { @@ -62,7 +58,6 @@ public ModelApiResponse type(String type) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public String getType() { @@ -82,7 +77,6 @@ public ModelApiResponse message(String message) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("message") public String getMessage() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java index 5c91c10e0a4a..6481a56724dd 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelFile.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Must be named `File` for test. **/ -@ApiModel(description = "Must be named `File` for test.") + @Schema(description="Must be named `File` for test.") @JsonTypeName("File") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -41,7 +38,6 @@ public ModelFile sourceURI(String sourceURI) { } - @ApiModelProperty(value = "Test capitalization") @Schema(description = "Test capitalization") @JsonProperty("sourceURI") public String getSourceURI() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java index a68c09eaf97c..0418b0742f00 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelList.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public ModelList _123list(String _123list) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123-list") public String get123list() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java index 6f24d55869d9..21708ddb78ab 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,7 +15,7 @@ /** * Model for testing reserved words **/ -@ApiModel(description = "Model for testing reserved words") + @Schema(description="Model for testing reserved words") @JsonTypeName("Return") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -40,7 +37,6 @@ public ModelReturn _return(Integer _return) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("return") public Integer getReturn() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java index 8c9d9a56bdee..1093dc026082 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Name.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +14,7 @@ /** * Model for testing model name same as property name **/ -@ApiModel(description = "Model for testing model name same as property name") + @Schema(description="Model for testing model name same as property name") @JsonTypeName("Name") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.18.0-SNAPSHOT") @@ -52,7 +49,6 @@ public Name name(Integer name) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public Integer getName() { @@ -72,7 +68,6 @@ public Name snakeCase(Integer snakeCase) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("snake_case") public Integer getSnakeCase() { @@ -92,7 +87,6 @@ public Name property(String property) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("property") public String getProperty() { @@ -112,7 +106,6 @@ public Name _123number(Integer _123number) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("123Number") public Integer get123number() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java index b6c80e7d9412..ba7ab0f5d832 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NullableClass.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -15,7 +13,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -53,7 +50,6 @@ public NullableClass integerProp(Integer integerProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("integer_prop") public Integer getIntegerProp() { @@ -73,7 +69,6 @@ public NullableClass numberProp(BigDecimal numberProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("number_prop") @Valid public BigDecimal getNumberProp() { @@ -93,7 +88,6 @@ public NullableClass booleanProp(Boolean booleanProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("boolean_prop") public Boolean getBooleanProp() { @@ -113,7 +107,6 @@ public NullableClass stringProp(String stringProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("string_prop") public String getStringProp() { @@ -133,7 +126,6 @@ public NullableClass dateProp(LocalDate dateProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("date_prop") public LocalDate getDateProp() { @@ -153,7 +145,6 @@ public NullableClass datetimeProp(Date datetimeProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("datetime_prop") public Date getDatetimeProp() { @@ -173,7 +164,6 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_nullable_prop") public List getArrayNullableProp() { @@ -209,7 +199,6 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_and_items_nullable_prop") public List getArrayAndItemsNullableProp() { @@ -245,7 +234,6 @@ public NullableClass arrayItemsNullable(List arrayItemsNullable) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("array_items_nullable") public List getArrayItemsNullable() { @@ -281,7 +269,6 @@ public NullableClass objectNullableProp(Map objectNullableProp) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_nullable_prop") public Map getObjectNullableProp() { @@ -317,7 +304,6 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_and_items_nullable_prop") public Map getObjectAndItemsNullableProp() { @@ -353,7 +339,6 @@ public NullableClass objectItemsNullable(Map objectItemsNullable } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("object_items_nullable") public Map getObjectItemsNullable() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java index d1d3e27be23a..1057c0ba31d3 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/NumberOnly.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public NumberOnly justNumber(BigDecimal justNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("JustNumber") @Valid public BigDecimal getJustNumber() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 7574ba165d1c..a28d3f2cc723 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -1,7 +1,5 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -11,7 +9,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -48,7 +45,6 @@ public ObjectWithDeprecatedFields uuid(String uuid) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("uuid") public String getUuid() { @@ -68,7 +64,6 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") @Valid public BigDecimal getId() { @@ -88,7 +83,6 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { @@ -108,7 +102,6 @@ public ObjectWithDeprecatedFields bars(List bars) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bars") public List getBars() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java index cb19a704b586..0d738476e0a6 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Order.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -95,7 +92,6 @@ public Order id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -115,7 +111,6 @@ public Order petId(Long petId) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("petId") public Long getPetId() { @@ -135,7 +130,6 @@ public Order quantity(Integer quantity) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("quantity") public Integer getQuantity() { @@ -155,7 +149,6 @@ public Order shipDate(Date shipDate) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("shipDate") public Date getShipDate() { @@ -176,7 +169,6 @@ public Order status(StatusEnum status) { } - @ApiModelProperty(value = "Order Status") @Schema(description = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { @@ -196,7 +188,6 @@ public Order complete(Boolean complete) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("complete") public Boolean getComplete() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java index 7e65361b629f..9051eb76d6e8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterComposite.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -42,7 +39,6 @@ public OuterComposite myNumber(BigDecimal myNumber) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_number") @Valid public BigDecimal getMyNumber() { @@ -62,7 +58,6 @@ public OuterComposite myString(String myString) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_string") public String getMyString() { @@ -82,7 +77,6 @@ public OuterComposite myBoolean(Boolean myBoolean) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("my_boolean") public Boolean getMyBoolean() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java index bb91956a7400..626633b65567 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java @@ -1,13 +1,10 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnumInteger; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -45,7 +42,6 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "value") @NotNull public OuterEnumInteger getValue() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java index 85e51ed609f7..750ba0cf47da 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -3,14 +3,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import org.openapitools.jackson.nullable.JsonNullable; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -94,7 +91,6 @@ public ParentWithNullable type(TypeEnum type) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("type") public TypeEnum getType() { @@ -114,7 +110,6 @@ public ParentWithNullable nullableProperty(String nullableProperty) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("nullableProperty") public String getNullableProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java index ae5466b55fa4..97fe2ac5e797 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -1,8 +1,6 @@ package org.openapitools.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -14,7 +12,6 @@ import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -111,7 +108,6 @@ public Pet id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -131,7 +127,6 @@ public Pet category(Category category) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("category") @Valid public Category getCategory() { @@ -151,7 +146,6 @@ public Pet name(String name) { } - @ApiModelProperty(example = "doggie", required = true, value = "") @Schema(example = "doggie", required = true, description = "") @JsonProperty(required = true, value = "name") @NotNull public String getName() { @@ -171,7 +165,6 @@ public Pet photoUrls(Set photoUrls) { } - @ApiModelProperty(required = true, value = "") @Schema(required = true, description = "") @JsonProperty(required = true, value = "photoUrls") @NotNull public Set getPhotoUrls() { @@ -208,7 +201,6 @@ public Pet tags(List<@Valid Tag> tags) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("tags") @Valid public List<@Valid Tag> getTags() { @@ -245,7 +237,6 @@ public Pet status(StatusEnum status) { } - @ApiModelProperty(value = "pet status in the store") @Schema(description = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index c1f123a9eb2c..396374dc05b8 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public ReadOnlyFirst bar(String bar) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("bar") public String getBar() { @@ -59,7 +55,6 @@ public ReadOnlyFirst baz(String baz) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("baz") public String getBaz() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java index 2a5ccb00e235..f0fd3e255295 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -1,13 +1,10 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,7 +35,6 @@ public SpecialModelName() { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("$special[property.name]") public Long get$SpecialPropertyName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java index 93d61c9a67b2..8ca87aec0bea 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/Tag.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -39,7 +36,6 @@ public Tag id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -59,7 +55,6 @@ public Tag name(String name) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("name") public String getName() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java index 1b3b4216f2aa..896f32091319 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -1,15 +1,12 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.util.HashMap; import java.util.Map; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -36,7 +33,6 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("someProperty") public String getSomeProperty() { diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java index 87284e131bbc..20dbdeb5f03a 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/User.java @@ -1,12 +1,9 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import javax.validation.constraints.*; import javax.validation.Valid; -import io.swagger.annotations.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; @@ -51,7 +48,6 @@ public User id(Long id) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("id") public Long getId() { @@ -71,7 +67,6 @@ public User username(String username) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("username") public String getUsername() { @@ -91,7 +86,6 @@ public User firstName(String firstName) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("firstName") public String getFirstName() { @@ -111,7 +105,6 @@ public User lastName(String lastName) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("lastName") public String getLastName() { @@ -131,7 +124,6 @@ public User email(String email) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("email") public String getEmail() { @@ -151,7 +143,6 @@ public User password(String password) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("password") public String getPassword() { @@ -171,7 +162,6 @@ public User phone(String phone) { } - @ApiModelProperty(value = "") @Schema(description = "") @JsonProperty("phone") public String getPhone() { @@ -192,7 +182,6 @@ public User userStatus(Integer userStatus) { } - @ApiModelProperty(value = "User Status") @Schema(description = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() {