diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache index 388f9664ac84..3f61290c55df 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiInterface.mustache @@ -7,7 +7,13 @@ {{#responses}} * @return {{{message}}} {{/responses}} + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} */ + {{#isDeprecated}} + @Deprecated + {{/isDeprecated}} @{{httpMethod}}{{#subresourceOperation}} @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}} @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @@ -27,7 +33,7 @@ {{/implicitHeadersParams.0}} @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{.}}}"{{/returnContainer}}){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} - @Operation(summary = "{{{summary}}}", description = "{{{notes}}}") + @Operation(summary = "{{{summary}}}", description = "{{{notes}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}) @ApiResponses(value = { {{#responses}} @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerV3Annotations}} {{#supportAsync}}{{>returnAsyncTypeInterface}}{{/supportAsync}}{{^supportAsync}}{{#returnResponse}}Response{{/returnResponse}}{{^returnResponse}}{{>returnTypeInterface}}{{/returnResponse}}{{/supportAsync}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>cookieParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache index 6ab8cf1b00a2..ea09783e3e2e 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/apiMethod.mustache @@ -1,3 +1,6 @@ + {{#isDeprecated}} + @Deprecated + {{/isDeprecated}} @{{httpMethod}}{{#subresourceOperation}} @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}} @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @@ -18,7 +21,7 @@ @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} - @Operation(summary = "{{{summary}}}", description = "{{{notes}}}") + @Operation(summary = "{{{summary}}}", description = "{{{notes}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}) @ApiResponses(value = { {{#responses}} @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerV3Annotations}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache index f938cb5b6bea..ad24da52660b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#useBeanValidation}}@Valid {{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}{{#useBeanValidation}}@Valid {{#required}}{{^isNullable}}@NotNull {{/isNullable}}{{/required}}{{/useBeanValidation}}{{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/cookieParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/cookieParams.mustache index 0a58596dfd58..0f8d12e85bb5 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/cookieParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/cookieParams.mustache @@ -1 +1 @@ -{{#isCookieParam}}@CookieParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isCookieParam}} \ No newline at end of file +{{#isCookieParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}@CookieParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache index e637fe40ff15..00c653c5df85 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache @@ -5,10 +5,16 @@ import com.fasterxml.jackson.annotation.JsonValue; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} +{{#isDeprecated}} + * @deprecated +{{/isDeprecated}} */ {{>generatedAnnotation}} -{{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} { +{{#isDeprecated}} +@Deprecated + +{{/isDeprecated}}{{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} { {{#gson}} {{#allowableValues}}{{#enumVars}} @SerializedName({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache index 885966e64426..e67c9fda95f3 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/formParams.mustache @@ -1 +1,2 @@ -{{#isFormParam}}{{^isFile}}@FormParam(value = "{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}} +{{#isDeprecated}}@Deprecated {{/isDeprecated}}{{^isFile}}@FormParam(value = "{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@FormParam(value = "{{baseName}}") InputStream {{paramName}}InputStream{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache index 94f69070463d..80e256e18153 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}} {{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}@HeaderParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}} {{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache index 730d8141a18c..400dbe663917 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiInterface.mustache @@ -1,3 +1,9 @@ + {{#isDeprecated}} + /** + * @deprecated + */ + @Deprecated + {{/isDeprecated}} {{#useGzipFeature}} @GZIP {{/useGzipFeature}} @@ -20,7 +26,7 @@ {{/implicitHeadersParams.0}} @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#returnContainer}}, responseContainer = "{{{.}}}"{{/returnContainer}}){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} - @Operation(summary = "{{{summary}}}", description = "{{{notes}}}") + @Operation(summary = "{{{summary}}}", description = "{{{notes}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}) @ApiResponses(value = { {{#responses}} @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} {{#hasAuthMethods}}@org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements(value = { @@ -28,7 +34,7 @@ name = "{{name}}", scopes = { {{#scopes}} "{{scope}}"{{^-last}},{{/-last}} {{/scopes}} }){{^-last}},{{/-last}}{{/isOAuth}}{{^isOAuth}} @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement(name = "{{name}}"){{^-last}},{{/-last}}{{/isOAuth}} {{/authMethods}} }){{/hasAuthMethods}} - @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "{{{operationId}}}", summary = "{{{summary}}}", description = "{{{notes}}}") + @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "{{{operationId}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}, summary = "{{{summary}}}", description = "{{{notes}}}") {{#vendorExtensions.x-tags}}@org.eclipse.microprofile.openapi.annotations.tags.Tag(name="{{tag}}"){{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}}{{#hasProduces}} @org.eclipse.microprofile.openapi.annotations.responses.APIResponses(value = { {{#responses}} @org.eclipse.microprofile.openapi.annotations.responses.APIResponse(responseCode = "{{{code}}}", description = "{{{message}}}", {{#responseHeaders.0}}headers = { {{#responseHeaders}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiMethod.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiMethod.mustache index 40790c7fab92..85c17fe4ae4f 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiMethod.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/libraries/quarkus/apiMethod.mustache @@ -1,6 +1,9 @@ {{#useGzipFeature}} @GZIP {{/useGzipFeature}} + {{#isDeprecated}} + @Deprecated + {{/isDeprecated}} @{{httpMethod}}{{#subresourceOperation}} @Path("{{{path}}}"){{/subresourceOperation}}{{#hasConsumes}} @Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @@ -21,14 +24,14 @@ @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} - @Operation(summary = "{{{summary}}}", description = "{{{notes}}}") + @Operation(summary = "{{{summary}}}", description = "{{{notes}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}) @ApiResponses(value = { {{#responses}} @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"){{^-last}},{{/-last}}{{/responses}} }){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} {{#hasAuthMethods}}@org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements(value={ {{#authMethods}}{{#isOAuth}}@org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement(name = "{{name}}", scopes = { {{#scopes}} "{{scope}}"{{^-last}},{{/-last}} {{/scopes}} }){{^-last}},{{/-last}}{{/isOAuth}}{{^isOAuth}} @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement(name = "{{name}}"){{^-last}},{{/-last}}{{/isOAuth}} {{/authMethods}} }){{/hasAuthMethods}} - @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "{{{operationId}}}", summary = "{{{summary}}}", description = "{{{notes}}}") + @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "{{{operationId}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}, summary = "{{{summary}}}", description = "{{{notes}}}") {{#vendorExtensions.x-tags}}@org.eclipse.microprofile.openapi.annotations.tags.Tag(name="{{tag}}"){{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}}{{#hasProduces}} @org.eclipse.microprofile.openapi.annotations.responses.APIResponses(value = { {{#responses}} @org.eclipse.microprofile.openapi.annotations.responses.APIResponse(responseCode = "{{{code}}}", description = "{{{message}}}", {{#responseHeaders.0}}headers = { {{#responseHeaders}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache index fea718e31b94..fa317ee181bf 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}@PathParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache index 079f695e9bc6..d39597fad10d 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -33,10 +33,16 @@ import {{javaxPackage}}.xml.bind.annotation.XmlEnumValue; {{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{#description}}/** * {{.}} + {{#isDeprecated}} + * @deprecated + {{/isDeprecated}} **/{{/description}} -{{#useSwaggerAnnotations}}{{#description}}@ApiModel(description = "{{{.}}}"){{/description}}{{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} -@Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} -@org.eclipse.microprofile.openapi.annotations.media.Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}){{/useMicroProfileOpenAPIAnnotations}} +{{#isDeprecated}} +@Deprecated + +{{/isDeprecated}}{{#useSwaggerAnnotations}}{{#description}}@ApiModel(description = "{{{.}}}"){{/description}}{{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} +@Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}{{#isDeprecated}}, deprecated = true{{/isDeprecated}}){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} +@org.eclipse.microprofile.openapi.annotations.media.Schema({{#title}}title="{{{.}}}", {{/title}}{{#description}}description="{{{.}}}"{{/description}}{{^description}}description=""{{/description}}{{#isDeprecated}}, deprecated = true{{/isDeprecated}}){{/useMicroProfileOpenAPIAnnotations}} {{#jackson}} @JsonTypeName("{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}") {{#additionalProperties}} @@ -62,6 +68,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#vendorExtensions.x-field-extra-annotation}} {{{.}}} {{/vendorExtensions.x-field-extra-annotation}} + {{#deprecated}} + @Deprecated + {{/deprecated}} {{#vendorExtensions.x-is-jackson-optional-nullable}} {{#isContainer}} private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined(); @@ -128,7 +137,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#maximum}} * maximum: {{.}} {{/maximum}} + {{#deprecated}} + * @deprecated + {{/deprecated}} **/ + {{#deprecated}} + @Deprecated + {{/deprecated}} public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { {{#vendorExtensions.x-is-jackson-optional-nullable}} this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}}); @@ -142,10 +157,16 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{#withXml}} @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}}) {{/withXml}} + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} {{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}{{#useSwaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{/useSwaggerAnnotations}}{{#useSwaggerV3Annotations}} - @Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} - @org.eclipse.microprofile.openapi.annotations.media.Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"){{/useMicroProfileOpenAPIAnnotations}} + @Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"{{#deprecated}}, deprecated = true{{/deprecated}}){{/useSwaggerV3Annotations}}{{#useMicroProfileOpenAPIAnnotations}} + @org.eclipse.microprofile.openapi.annotations.media.Schema({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}"{{#deprecated}}, deprecated = true{{/deprecated}}){{/useMicroProfileOpenAPIAnnotations}} {{#jackson}}@JsonProperty({{#required}}required = {{required}}, value = {{/required}}"{{baseName}}"){{/jackson}} {{#vendorExtensions.x-is-jackson-optional-nullable}} public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}() { @@ -158,6 +179,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens } {{/vendorExtensions.x-is-jackson-optional-nullable}} + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} {{#jackson}} @JsonProperty({{#required}}required = {{required}}, value = {{/required}}"{{baseName}}") {{/jackson}} @@ -172,6 +199,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens } {{#isArray}} + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent() || this.{{name}}.get() == null) { @@ -194,6 +227,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} } + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} public {{classname}} remove{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if ({{name}}Item != null && this.{{name}} != null && this.{{name}}.isPresent()) { @@ -214,6 +253,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens } {{/isArray}} {{#isMap}} + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} public {{classname}} put{{nameInPascalCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent() || this.{{name}}.get() == null) { @@ -236,6 +281,12 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} } + {{#deprecated}} + /** + * @deprecated + */ + @Deprecated + {{/deprecated}} public {{classname}} remove{{nameInPascalCase}}Item(String key) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} != null && this.{{name}}.isPresent()) { @@ -325,6 +376,9 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens {{/parent}} {{#vars}} + {{#deprecated}} + @Deprecated + {{/deprecated}} public B {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { this.{{name}} = {{name}}; return self(); diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache index 3e69e743e4ea..3f8c985a4a71 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{#isDeprecated}}@Deprecated {{/isDeprecated}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{^isContainer}}{{#defaultValue}} @DefaultValue("{{{.}}}"){{/defaultValue}}{{/isContainer}} {{#useSwaggerAnnotations}}{{#description}} @ApiParam("{{.}}"){{/description}}{{/useSwaggerAnnotations}}{{#useMicroProfileOpenAPIAnnotations}}{{#description}} @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="{{.}}"){{/description}}{{/useMicroProfileOpenAPIAnnotations}} {{{dataType}}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 246366ec84ea..2405db2364a1 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -1307,4 +1307,39 @@ public void testGenerateJsonNullableListFieldsHelperMethodReferences_issue23251( output.deleteOnExit(); } + /** + * OpenAPI {@code deprecated} should surface as {@code @Deprecated} in jaxrs-spec output. + */ + @Test + public void generatesDeprecatedAnnotationsForModelsOperationsAndParameters_issue18941() throws Exception { + final File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + final OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); + + codegen.setOutputDir(output.getAbsolutePath()); + codegen.additionalProperties().put(INTERFACE_ONLY, true); + + final ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + final DefaultGenerator generator = new DefaultGenerator(); + final List files = generator.opts(input).generate(); + + validateJavaSourceFiles(files); + + Path pet = output.toPath().resolve("src/gen/java/org/openapitools/model/Pet.java"); + JavaFileAssert.assertThat(pet) + .assertProperty("status").assertPropertyAnnotations().containsWithName("Deprecated"); + JavaFileAssert.assertThat(pet).assertMethod("getStatus").hasAnnotation("Deprecated"); + JavaFileAssert.assertThat(pet).assertMethod("setStatus", "StatusEnum").hasAnnotation("Deprecated"); + + Path petApi = output.toPath().resolve("src/gen/java/org/openapitools/api/PetApi.java"); + JavaFileAssert.assertThat(petApi).assertMethod("findPetsByTags", "List").hasAnnotation("Deprecated"); + JavaFileAssert.assertThat(petApi).fileContains("* @deprecated", "findPetsByTags"); + JavaFileAssert.assertThat(petApi).fileContains("findPetsByStatus", "@Deprecated", "@QueryParam(\"status\")"); + } + } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java index d6744190fdd6..fb398c654800 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java @@ -80,7 +80,7 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class, responseContainer = "List") }) - Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status); + Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status); /** @@ -89,7 +89,9 @@ public interface PetApi { * @param tags Tags to filter by * @return successful operation * @return Invalid tag value + * @deprecated */ + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -190,6 +192,6 @@ public interface PetApi { }, tags={ "pet" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream); + Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata,@FormParam(value = "file") InputStream _fileInputStream); } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java index 3db1f8511fbd..8737edae4a8d 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java @@ -78,6 +78,7 @@ public static StatusEnum fromValue(String value) { } } + @Deprecated private StatusEnum status; public Pet() { @@ -221,12 +222,18 @@ public Pet removeTagsItem(Tag tagsItem) { } /** * pet status in the store + * @deprecated **/ + @Deprecated public Pet status(StatusEnum status) { this.status = status; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") @@ -234,6 +241,10 @@ public StatusEnum getStatus() { return status; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("status") public void setStatus(StatusEnum status) { this.status = status; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index 83d27472e9be..93d65c583a3b 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -82,7 +82,7 @@ public interface PetApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class, responseContainer = "List") }) - List findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status); + List findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status); /** @@ -91,7 +91,9 @@ public interface PetApi { * @param tags Tags to filter by * @return successful operation * @return Invalid tag value + * @deprecated */ + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -192,6 +194,6 @@ public interface PetApi { }, tags={ "pet" }) @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - ModelApiResponse uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream); + ModelApiResponse uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata,@FormParam(value = "file") InputStream _fileInputStream); } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index 3db1f8511fbd..8737edae4a8d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -78,6 +78,7 @@ public static StatusEnum fromValue(String value) { } } + @Deprecated private StatusEnum status; public Pet() { @@ -221,12 +222,18 @@ public Pet removeTagsItem(Tag tagsItem) { } /** * pet status in the store + * @deprecated **/ + @Deprecated public Pet status(StatusEnum status) { this.status = status; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") @@ -234,6 +241,10 @@ public StatusEnum getStatus() { return status; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("status") public void setStatus(StatusEnum status) { this.status = status; diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java index 3d3841137b2d..19a28940ea44 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java @@ -129,7 +129,7 @@ public Response testClientModel(@Valid @NotNull Client body) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -200,7 +200,7 @@ public Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-jakarta/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/PetApi.java index d9e0bbfe81bc..99e93648d31b 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/PetApi.java @@ -73,6 +73,7 @@ public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Stat return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -149,7 +150,7 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java index 6fc697707bcc..0e22c2520ba9 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/PetApi.java @@ -106,17 +106,18 @@ public Response deletePet(@PathParam("petId") @org.eclipse.microprofile.openapi. @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json") }) }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements(value={ @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement(name = "petstore_auth", scopes = { "read:pets" }) }) - @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "findPetsByTags", summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") + @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "findPetsByTags", deprecated = true, summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @org.eclipse.microprofile.openapi.annotations.tags.Tag(name="pet") @org.eclipse.microprofile.openapi.annotations.responses.APIResponses(value = { @org.eclipse.microprofile.openapi.annotations.responses.APIResponse(responseCode = "200", description = "successful operation", content = { @@ -219,7 +220,7 @@ public Response updatePetWithForm(@PathParam("petId") @org.eclipse.microprofile. @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = ModelApiResponse.class)) }) }) - public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="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-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java index 99dc57a2ef61..17abc39a981b 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java @@ -76,6 +76,7 @@ public static StatusEnum fromValue(String value) { } } + @Deprecated private StatusEnum status; protected Pet(PetBuilder b) { @@ -228,19 +229,29 @@ public Pet removeTagsItem(Tag tagsItem) { } /** * pet status in the store + * @deprecated **/ + @Deprecated public Pet status(StatusEnum status) { this.status = status; return this; } + /** + * @deprecated + */ + @Deprecated - @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "pet status in the store") + @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "pet status in the store", deprecated = true) @JsonProperty("status") public StatusEnum getStatus() { return status; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("status") public void setStatus(StatusEnum status) { this.status = status; @@ -341,6 +352,7 @@ public B tags(List tags) { this.tags = tags; return self(); } + @Deprecated public B status(StatusEnum status) { this.status = status; return self(); diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java index 260a3fe7bed9..ac9f7a1a3193 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java @@ -297,7 +297,7 @@ public Response testClientModel(@Valid @NotNull Client client) { }) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") LocalDateTime dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") LocalDateTime dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -436,7 +436,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = ModelApiResponse.class)) }) }) - public Response uploadFileWithRequiredFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata") String additionalMetadata) { + public Response uploadFileWithRequiredFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="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-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java index 3d05bda01d14..b154a9ce2667 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/PetApi.java @@ -123,17 +123,18 @@ public Response deletePet(@PathParam("petId") @org.eclipse.microprofile.openapi. @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json") }) }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements(value={ @org.eclipse.microprofile.openapi.annotations.security.SecurityRequirement(name = "petstore_auth", scopes = { "write:pets", "read:pets" }) }) - @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "findPetsByTags", summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") + @org.eclipse.microprofile.openapi.annotations.Operation(operationId = "findPetsByTags", deprecated = true, summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") @org.eclipse.microprofile.openapi.annotations.tags.Tag(name="pet") @org.eclipse.microprofile.openapi.annotations.responses.APIResponses(value = { @org.eclipse.microprofile.openapi.annotations.responses.APIResponse(responseCode = "200", description = "successful operation", content = { @@ -234,7 +235,7 @@ public Response updatePetWithForm(@PathParam("petId") @org.eclipse.microprofile. @org.eclipse.microprofile.openapi.annotations.media.Content(mediaType="application/json", schema = @org.eclipse.microprofile.openapi.annotations.media.Schema(implementation = ModelApiResponse.class)) }) }) - public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream _fileInputStream) { + public Response uploadFile(@PathParam("petId") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="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-quarkus-mutiny/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/DeprecatedObject.java index f697b31bb57a..94998dafac39 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -12,8 +12,10 @@ import org.openapitools.jackson.nullable.JsonNullable; +@Deprecated -@org.eclipse.microprofile.openapi.annotations.media.Schema(description="") + +@org.eclipse.microprofile.openapi.annotations.media.Schema(description="", deprecated = true) @JsonTypeName("DeprecatedObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class DeprecatedObject implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index b23ea9c4df7c..d24eb6c616ba 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -23,8 +23,11 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -57,62 +60,96 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } + /** + * @deprecated + */ + @Deprecated - @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") + @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "", deprecated = true) @JsonProperty("id") @Valid public BigDecimal getId() { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } + /** + * @deprecated + */ + @Deprecated - @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") + @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "", deprecated = true) @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } + /** + * @deprecated + */ + @Deprecated - @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "") + @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "", deprecated = true) @JsonProperty("bars") public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -122,6 +159,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -202,14 +243,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self(); diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java index 477da784cfa5..a59689644fba 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/FakeApi.java @@ -210,7 +210,7 @@ public Response testClientModel(@Valid @NotNull Client client) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -317,7 +317,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-annotations/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/PetApi.java index bf9395ed0658..3c200d23ab24 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/api/PetApi.java @@ -69,10 +69,11 @@ public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -150,7 +151,7 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java index 94b10e03f6b2..e0aafdf0fdb5 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -15,6 +15,8 @@ import org.openapitools.jackson.nullable.JsonNullable; +@Deprecated + @JsonTypeName("DeprecatedObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 573d765a17b2..0d2a10e7b3cc 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -25,8 +25,11 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -59,12 +62,18 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("id") @@ -72,18 +81,28 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("deprecatedRef") @@ -91,18 +110,28 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("bars") @@ -110,11 +139,19 @@ public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -124,6 +161,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -204,14 +245,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self(); 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 dcec5ac49cd7..b30a308928aa 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 @@ -207,7 +207,7 @@ public Response testClientModel(@Valid @NotNull Client client) { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -304,7 +304,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @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") 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/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/api/PetApi.java index 67ac3c061037..3aaed48a20c0 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 @@ -57,14 +57,15 @@ public Response deletePet(@PathParam("petId") Long petId) { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") + @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", deprecated = true) @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") @@ -119,7 +120,7 @@ public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(valu @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") 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/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/gen/java/org/openapitools/model/DeprecatedObject.java index 43d9327a5fc0..4d8ebd5e3cb8 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 @@ -13,8 +13,10 @@ import org.openapitools.jackson.nullable.JsonNullable; +@Deprecated -@Schema(description="") + +@Schema(description="", deprecated = true) @JsonTypeName("DeprecatedObject") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class DeprecatedObject implements Serializable { 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 91f85b7e1ace..799800c16315 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 @@ -24,8 +24,11 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -58,62 +61,96 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("id") @Valid public BigDecimal getId() { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("bars") public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -123,6 +160,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -203,14 +244,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self(); 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 fd774f140034..003fec4d11f7 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 @@ -207,7 +207,7 @@ public Response testClientModel(@Valid @NotNull Client client) { @ApiResponse(responseCode = "400", description = "Invalid username supplied"), @ApiResponse(responseCode = "404", description = "User not found") }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -304,7 +304,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @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") 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/PetApi.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/api/PetApi.java index e22c9e0be959..6690c627fb22 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 @@ -57,14 +57,15 @@ public Response deletePet(@PathParam("petId") Long petId) { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid status value") }) - public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.") + @Operation(summary = "Finds Pets by tags", description = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", deprecated = true) @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "successful operation"), @ApiResponse(responseCode = "400", description = "Invalid tag value") @@ -119,7 +120,7 @@ public Response updatePetWithForm(@PathParam("petId") Long petId,@FormParam(valu @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") 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/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/gen/java/org/openapitools/model/DeprecatedObject.java index a062a375fb29..246c16745377 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 @@ -13,8 +13,10 @@ import org.openapitools.jackson.nullable.JsonNullable; +@Deprecated -@Schema(description="") + +@Schema(description="", deprecated = true) @JsonTypeName("DeprecatedObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class DeprecatedObject implements Serializable { 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 f883a89009b7..f6228a52fdc7 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 @@ -24,8 +24,11 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -58,62 +61,96 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("id") @Valid public BigDecimal getId() { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("deprecatedRef") @Valid public DeprecatedObject getDeprecatedRef() { return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } + /** + * @deprecated + */ + @Deprecated - @Schema(description = "") + @Schema(description = "", deprecated = true) @JsonProperty("bars") public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -123,6 +160,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -203,14 +244,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self(); diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java index 219be1e3de75..b939d84f5dda 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/FakeApi.java @@ -210,7 +210,7 @@ public Response testClientModel(@Valid @NotNull Client client) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -314,7 +314,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-withxml/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/PetApi.java index 1c3614c6f6d4..57eb2636edb5 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/api/PetApi.java @@ -66,10 +66,11 @@ public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -147,7 +148,7 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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-withxml/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/DeprecatedObject.java index 3a36fd7314a5..ee6c3cbf52ba 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -22,6 +22,8 @@ import javax.xml.bind.annotation.XmlEnumValue; +@Deprecated + @JsonTypeName("DeprecatedObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 485d2f7484d5..4ba1abc5bb5b 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec-withxml/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -38,8 +38,11 @@ public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -73,13 +76,19 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } @XmlElement(name="id") + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("id") @@ -87,19 +96,29 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } @XmlElement(name="deprecatedRef") + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("deprecatedRef") @@ -107,19 +126,29 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } @XmlElement(name="bars") + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("bars") @@ -127,11 +156,19 @@ public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -141,6 +178,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -221,14 +262,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self(); diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java index 477da784cfa5..a59689644fba 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java @@ -210,7 +210,7 @@ public Response testClientModel(@Valid @NotNull Client client) { @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class), @ApiResponse(code = 404, message = "User not found", response = Void.class) }) - public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { + public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { return Response.ok().entity("magic!").build(); } @@ -317,7 +317,7 @@ public Response testStringMapReference(@Valid @NotNull Map reque @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index bf9395ed0658..3c200d23ab24 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -69,10 +69,11 @@ public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Void.class) }) - public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { + public Response findPetsByStatus(@Deprecated @QueryParam("status") @NotNull @ApiParam("Status values that need to be considered for filter") List status) { return Response.ok().entity("magic!").build(); } + @Deprecated @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -150,7 +151,7 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) - 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") @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/src/gen/java/org/openapitools/model/DeprecatedObject.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DeprecatedObject.java index 94b10e03f6b2..e0aafdf0fdb5 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DeprecatedObject.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/DeprecatedObject.java @@ -15,6 +15,8 @@ import org.openapitools.jackson.nullable.JsonNullable; +@Deprecated + @JsonTypeName("DeprecatedObject") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java index 573d765a17b2..0d2a10e7b3cc 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java @@ -25,8 +25,11 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.23.0-SNAPSHOT") public class ObjectWithDeprecatedFields implements Serializable { private String uuid; + @Deprecated private BigDecimal id; + @Deprecated private DeprecatedObject deprecatedRef; + @Deprecated private @Valid List bars = new ArrayList<>(); protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder b) { @@ -59,12 +62,18 @@ public void setUuid(String uuid) { } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields id(BigDecimal id) { this.id = id; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("id") @@ -72,18 +81,28 @@ public ObjectWithDeprecatedFields id(BigDecimal id) { return id; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("id") public void setId(BigDecimal id) { this.id = id; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("deprecatedRef") @@ -91,18 +110,28 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef) return deprecatedRef; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("deprecatedRef") public void setDeprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; } /** + * @deprecated **/ + @Deprecated public ObjectWithDeprecatedFields bars(List bars) { this.bars = bars; return this; } + /** + * @deprecated + */ + @Deprecated @ApiModelProperty(value = "") @JsonProperty("bars") @@ -110,11 +139,19 @@ public List getBars() { return bars; } + /** + * @deprecated + */ + @Deprecated @JsonProperty("bars") public void setBars(List bars) { this.bars = bars; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { this.bars = new ArrayList<>(); @@ -124,6 +161,10 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) { return this; } + /** + * @deprecated + */ + @Deprecated public ObjectWithDeprecatedFields removeBarsItem(String barsItem) { if (barsItem != null && this.bars != null) { this.bars.remove(barsItem); @@ -204,14 +245,17 @@ public B uuid(String uuid) { this.uuid = uuid; return self(); } + @Deprecated public B id(BigDecimal id) { this.id = id; return self(); } + @Deprecated public B deprecatedRef(DeprecatedObject deprecatedRef) { this.deprecatedRef = deprecatedRef; return self(); } + @Deprecated public B bars(List bars) { this.bars = bars; return self();