diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index 2d18f1b22017..4cc5dffec9ce 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -22,6 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger1| |apiPackage|package for generated api classes| |org.openapitools.api| |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java| |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-client| @@ -39,6 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| +|documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**swagger1**
Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.
**swagger2**
Generate an OpenAPI 3 specification using Swagger-Core 2.x.
|swagger1| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false| |groupId|groupId in generated pom.xml| |org.openapitools| diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md index b405eedd6a2b..45d49dfe46f6 100644 --- a/docs/generators/jaxrs-cxf-extended.md +++ b/docs/generators/jaxrs-cxf-extended.md @@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger1| |apiPackage|package for generated api classes| |org.openapitools.api| |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java| |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server| @@ -40,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| +|documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**swagger1**
Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.
**swagger2**
Generate an OpenAPI 3 specification using Swagger-Core 2.x.
|swagger1| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false| |generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false| diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index 6cd6db12322f..a89081a81679 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |additionalOneOfTypeAnnotations|Additional annotations for oneOf interfaces(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false| +|annotationLibrary|Select the complementary documentation annotation library.|
**none**
Do not annotate Model and Api with complementary annotations.
**swagger1**
Annotate Model and Api using the Swagger Annotations 1.x library.
**swagger2**
Annotate Model and Api using the Swagger Annotations 2.x library.
|swagger1| |apiPackage|package for generated api classes| |org.openapitools.api| |artifactDescription|artifact description in generated pom.xml| |OpenAPI Java| |artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-cxf-server| @@ -40,6 +41,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| +|documentationProvider|Select the OpenAPI documentation provider.|
**none**
Do not publish an OpenAPI specification.
**swagger1**
Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using Swagger-Core 1.x.
**swagger2**
Generate an OpenAPI 3 specification using Swagger-Core 2.x.
|swagger1| |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true| |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false| |generateJbossDeploymentDescriptor|Generate Jboss Deployment Descriptor| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java index 032668cee009..c52d3d2155ef 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java @@ -18,6 +18,7 @@ package org.openapitools.codegen.languages; import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.BeanValidationFeatures; import org.openapitools.codegen.languages.features.GzipTestFeatures; @@ -136,6 +137,20 @@ public String getName() { return "jaxrs-cxf-client"; } + @Override + public List supportedDocumentationProvider() { + return List.of(DocumentationProvider.NONE, DocumentationProvider.SWAGGER1, DocumentationProvider.SWAGGER2); + } + + @Override + public List supportedAnnotationLibraries() { + return List.of(AnnotationLibrary.NONE, AnnotationLibrary.SWAGGER1, AnnotationLibrary.SWAGGER2); + } + + @Override + public DocumentationProvider defaultDocumentationProvider() { + return DocumentationProvider.SWAGGER1; + } @Override public CodegenType getTag() { @@ -148,15 +163,22 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera co.subresourceOperation = !co.path.isEmpty(); } + @Override + public CodegenModel fromModel(String name, Schema model) { + CodegenModel m = super.fromModel(name, model); + m.imports.remove("ApiModel"); + return m; + } + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); model.imports.remove("ApiModelProperty"); model.imports.remove("ApiModel"); model.imports.remove("JsonSerialize"); + model.imports.remove("JsonTypeName"); model.imports.remove("ToStringSerializer"); - if (useJackson) { //Add jackson imports when model has inner enum if (Boolean.FALSE.equals(model.isEnum) && Boolean.TRUE.equals(model.hasEnums)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java index 26c99103f236..387d6789c299 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.features.CXFServerFeatures; @@ -26,7 +25,6 @@ import org.openapitools.codegen.languages.features.UseGenericResponseFeatures; import org.openapitools.codegen.model.ModelMap; import org.openapitools.codegen.model.OperationsMap; -import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -247,12 +245,35 @@ public String getName() { return "jaxrs-cxf"; } + @Override + public List supportedDocumentationProvider() { + return List.of(DocumentationProvider.NONE, DocumentationProvider.SWAGGER1, DocumentationProvider.SWAGGER2); + } + + @Override + public List supportedAnnotationLibraries() { + return List.of(AnnotationLibrary.NONE, AnnotationLibrary.SWAGGER1, AnnotationLibrary.SWAGGER2); + } + + @Override + public DocumentationProvider defaultDocumentationProvider() { + return DocumentationProvider.SWAGGER1; + } + + @Override + public CodegenModel fromModel(String name, Schema model) { + CodegenModel m = super.fromModel(name, model); + m.imports.remove("ApiModel"); + return m; + } + @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { super.postProcessModelProperty(model, property); model.imports.remove("ApiModelProperty"); model.imports.remove("ApiModel"); model.imports.remove("JsonSerialize"); + model.imports.remove("JsonTypeName"); model.imports.remove("ToStringSerializer"); //Add imports for Jackson when model has inner enum diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api.mustache index 40dbce32d8fb..0b1b89b7c2c9 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/api.mustache @@ -3,20 +3,40 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +{{#useAbstractionForFiles}} import java.io.InputStream; -import java.io.OutputStream; +{{/useAbstractionForFiles}} import java.util.List; import java.util.Map; import {{javaxPackage}}.ws.rs.*; +{{#useGenericResponse}} import {{javaxPackage}}.ws.rs.core.Response; +{{/useGenericResponse}} +{{#addConsumesProducesJson}} import {{javaxPackage}}.ws.rs.core.MediaType; +{{/addConsumesProducesJson}} import org.apache.cxf.jaxrs.ext.multipart.*; +{{#swagger1AnnotationLibrary}} import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.ApiResponse; import io.swagger.jaxrs.PATCH; +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.info.Info; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +{{/swagger2AnnotationLibrary}} {{#useBeanValidation}} import {{javaxPackage}}.validation.constraints.*; import {{javaxPackage}}.validation.Valid; @@ -33,7 +53,18 @@ import {{javaxPackage}}.validation.Valid; */ {{/appName}} @Path("{{#useAnnotatedBasePath}}{{contextPath}}{{/useAnnotatedBasePath}}{{commonPath}}") +{{#swagger1AnnotationLibrary}} @Api(value = "/", description = "{{description}}") +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} +@OpenAPIDefinition( + info = @Info( + {{#appName}}title = "{{{appName}}}",{{/appName}} + {{#appDescription}}description = "{{{appDescription}}}",{{/appDescription}} + version = "{{{appVersion}}}" + ) +) +{{/swagger2AnnotationLibrary}} {{#addConsumesProducesJson}} @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) @@ -60,6 +91,7 @@ public interface {{classname}} { {{#hasProduces}} @Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }) {{/hasProduces}} +{{#swagger1AnnotationLibrary}} @ApiOperation(value = "{{{summary}}}", tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}} }) {{#implicitHeadersParams.0}} @io.swagger.annotations.ApiImplicitParams({ @@ -70,6 +102,19 @@ public interface {{classname}} { {{/implicitHeadersParams.0}} @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{^vendorExtensions.x-java-is-response-void}}, response = {{#isFile}}{{#useAbstractionForFiles}}InputStream{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{baseType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{baseType}}}{{/isFile}}.class{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}{{/vendorExtensions.x-java-is-response-void}}){{^-last}},{{/-last}}{{/responses}} }) +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + @Operation(operationId = "{{{operationIdOriginal}}}"{{#summary}}, summary = "{{{.}}}"{{/summary}}, {{#isDeprecated}}deprecated = true, {{/isDeprecated}} tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-tags}} }) + @ApiResponses(value = { {{#responses}} + @ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{^vendorExtensions.x-java-is-response-void}}, content = @Content({{#containerType}}array = @ArraySchema({{/containerType}}schema = @Schema(implementation = {{#isFile}}{{#useAbstractionForFiles}}InputStream{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{baseType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{baseType}}}{{/isFile}}.class){{#containerType}}){{/containerType}}){{/vendorExtensions.x-java-is-response-void}}){{^-last}},{{/-last}}{{/responses}} }) + {{#implicitHeadersParams.0}} + @Parameters({ + {{#implicitHeadersParams}} + {{>paramDoc}}{{^-last}},{{/-last}} + {{/implicitHeadersParams}} + }) + {{/implicitHeadersParams.0}} +{{/swagger2AnnotationLibrary}} public {{>returnTypes}} {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}); {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache index 84f0d426e21e..47f6cc21c5a2 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/apiServiceImpl.mustache @@ -15,7 +15,6 @@ import org.apache.cxf.jaxrs.model.wadl.DocTarget; import org.apache.cxf.jaxrs.ext.multipart.*; -import io.swagger.annotations.Api; {{#useSpringAnnotationConfig}} import org.springframework.stereotype.Service; {{/useSpringAnnotationConfig}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/paramDoc.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/paramDoc.mustache new file mode 100644 index 000000000000..6c5cc99a35ce --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/paramDoc.mustache @@ -0,0 +1 @@ +@Parameter(name = "{{{baseName}}}"{{#isDeprecated}}, deprecated = true{{/isDeprecated}}, description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#isPathParam}}, in = ParameterIn.PATH{{/isPathParam}}{{#isQueryParam}}, in = ParameterIn.QUERY{{/isQueryParam}}{{#isCookieParam}}, in = ParameterIn.COOKIE{{/isCookieParam}}{{#isHeaderParam}}, in = ParameterIn.HEADER{{/isHeaderParam}}) \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache index 9e707960cc76..9ffec5481f2b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -1,4 +1,12 @@ +{{#swagger1AnnotationLibrary}} +{{#description}} +import io.swagger.annotations.ApiModel; +{{/description}} import io.swagger.annotations.ApiModelProperty; +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} +import io.swagger.v3.oas.annotations.media.Schema; +{{/swagger2AnnotationLibrary}} import java.util.Objects; {{#withXml}} import {{javaxPackage}}.xml.bind.annotation.XmlElement; @@ -13,9 +21,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; {{#description}} /** - * {{{description}}} - **/ + * {{{description}}} + */ +{{#swagger1AnnotationLibrary}} @ApiModel(description="{{{description}}}") +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} +@Schema(description="{{{description}}}") +{{/swagger2AnnotationLibrary}} {{/description}} {{>additionalModelTypeAnnotations}}{{>xmlPojoAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}} {{#vendorExtensions.x-class-extra-annotation}} @@ -25,16 +38,23 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi {{#vars}}{{#isEnum}}{{^isContainer}} {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}} {{>enumClass}}{{/mostInnerItems}}{{/isContainer}}{{/isEnum}} -{{#withXml}} - @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}}) -{{/withXml}} - @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}"){{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} - @Valid{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}} {{#description}} /** - * {{{.}}} - **/ + * {{{.}}} + */ {{/description}} +{{#withXml}} + @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}}) +{{/withXml}} +{{#swagger1AnnotationLibrary}} + @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + @Schema(description = "{{{description}}}"{{#example}}, example = "{{{example}}}"{{/example}}{{#required}}, requiredMode = Schema.RequiredMode.REQUIRED{{/required}}) +{{/swagger2AnnotationLibrary}} +{{^isPrimitiveType}}{{^isDate}}{{^isDateTime}}{{^isString}}{{^isFile}}{{#useBeanValidation}} + @Valid +{{/useBeanValidation}}{{/isFile}}{{/isString}}{{/isDateTime}}{{/isDate}}{{/isPrimitiveType}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache index dc79d9d4560a..5783ef0c4878 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -100,6 +100,7 @@ +{{#swagger1AnnotationLibrary}} io.swagger swagger-jaxrs @@ -114,6 +115,14 @@ for this project used jakarta.validation-api --> +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + + io.swagger.core.v3 + swagger-annotations + ${swagger-annotations-version} + +{{/swagger2AnnotationLibrary}} ch.qos.logback logback-classic @@ -217,7 +226,12 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.18 +{{#swagger1AnnotationLibrary}} + 1.6.6 +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + 2.2.7 +{{/swagger2AnnotationLibrary}} 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/ApplicationContext.xml.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/ApplicationContext.xml.mustache index fea1aecd1747..110d2bb7a1bb 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/ApplicationContext.xml.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/ApplicationContext.xml.mustache @@ -34,6 +34,7 @@ {{/useSpringAnnotationConfig}} {{#useSwaggerFeature}} +{{#swagger1AnnotationLibrary}} {{! http://cxf.apache.org/docs/swagger2feature.html }} @@ -48,6 +49,7 @@ +{{/swagger1AnnotationLibrary}} {{/useSwaggerFeature}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index c7c04ac176ab..4395b9c524a7 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -109,6 +109,7 @@ +{{#swagger1AnnotationLibrary}} io.swagger swagger-jaxrs @@ -123,6 +124,14 @@ for this project used jakarta.validation-api --> +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + + io.swagger.core.v3 + swagger-annotations + ${swagger-annotations-version} + +{{/swagger2AnnotationLibrary}} ch.qos.logback logback-classic @@ -173,7 +182,12 @@ for this project used jakarta.validation-api --> org.apache.cxf +{{#swagger1AnnotationLibrary}} cxf-rt-rs-service-description-swagger +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + cxf-rt-rs-service-description-openapi-v3 +{{/swagger2AnnotationLibrary}} ${cxf-version} compile @@ -268,7 +282,12 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.22 +{{#swagger1AnnotationLibrary}} + 1.6.6 +{{/swagger1AnnotationLibrary}} +{{#swagger2AnnotationLibrary}} + 2.2.7 +{{/swagger2AnnotationLibrary}} 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml index 9f9b7a96fadb..96f3c038b085 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml @@ -183,7 +183,7 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.18 + 1.6.6 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/PetApi.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/PetApi.java index cb3a46b1f51a..9ed0722a827a 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/PetApi.java @@ -4,13 +4,9 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java index 4d34cf13193d..89f06783cef6 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/StoreApi.java @@ -2,13 +2,9 @@ import org.openapitools.model.Order; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/UserApi.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/UserApi.java index 31d37fe19cd4..3b1dd0ef5745 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/api/UserApi.java @@ -3,13 +3,9 @@ import java.util.Date; import org.openapitools.model.User; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Category.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Category.java index dccf1f3db9c5..55629a6ed0b9 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Category.java @@ -1,22 +1,24 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A category for a pet - **/ + * A category for a pet + */ @ApiModel(description="A category for a pet") public class Category { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/ModelApiResponse.java index af32c823d47a..b83dd190195b 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,26 +1,29 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Describes the result of uploading an image resource - **/ + * Describes the result of uploading an image resource + */ @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code; @ApiModelProperty(value = "") + private String type; @ApiModelProperty(value = "") + private String message; /** * Get code diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Order.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Order.java index 327e990d676d..dd138eac3273 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Order.java @@ -2,30 +2,34 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.Date; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * An order for a pets from the pet store - **/ + * An order for a pets from the pet store + */ @ApiModel(description="An order for a pets from the pet store") public class Order { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Long petId; @ApiModelProperty(value = "") + private Integer quantity; @ApiModelProperty(value = "") + private Date shipDate; public enum StatusEnum { @@ -60,13 +64,15 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "Order Status") /** - * Order Status - **/ + * Order Status + */ + @ApiModelProperty(value = "Order Status") + private StatusEnum status; @ApiModelProperty(value = "") + private Boolean complete = false; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java index 539ef8a6722f..71b6a64322ce 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java @@ -2,37 +2,42 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.model.Category; import org.openapitools.model.Tag; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A pet for sale in the pet store - **/ + * A pet for sale in the pet store + */ @ApiModel(description="A pet for sale in the pet store") public class Pet { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Category category; @ApiModelProperty(example = "doggie", required = true, value = "") + private String name; @ApiModelProperty(required = true, value = "") + private List photoUrls = new ArrayList<>(); @ApiModelProperty(value = "") + private List tags; public enum StatusEnum { @@ -67,10 +72,11 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "pet status in the store") /** - * pet status in the store - **/ + * pet status in the store + */ + @ApiModelProperty(value = "pet status in the store") + private StatusEnum status; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Tag.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Tag.java index 9c011ae12b41..81b61d461cfe 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Tag.java @@ -1,22 +1,24 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A tag for a pet - **/ + * A tag for a pet + */ @ApiModel(description="A tag for a pet") public class Tag { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/User.java b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/User.java index 001a0b7437b4..a27f47d99ce5 100644 --- a/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/User.java +++ b/samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/User.java @@ -1,43 +1,51 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A User who is purchasing from the pet store - **/ + * A User who is purchasing from the pet store + */ @ApiModel(description="A User who is purchasing from the pet store") public class User { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String username; @ApiModelProperty(value = "") + private String firstName; @ApiModelProperty(value = "") + private String lastName; @ApiModelProperty(value = "") + private String email; @ApiModelProperty(value = "") + private String password; @ApiModelProperty(value = "") + private String phone; - @ApiModelProperty(value = "User Status") /** - * User Status - **/ + * User Status + */ + @ApiModelProperty(value = "User Status") + private Integer userStatus; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 283b696df7fe..74bebd88328e 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -183,7 +183,7 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.18 + 1.6.6 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java index cb3a46b1f51a..9ed0722a827a 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/PetApi.java @@ -4,13 +4,9 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java index 4d34cf13193d..89f06783cef6 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/StoreApi.java @@ -2,13 +2,9 @@ import org.openapitools.model.Order; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java index 31d37fe19cd4..3b1dd0ef5745 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/api/UserApi.java @@ -3,13 +3,9 @@ import java.util.Date; import org.openapitools.model.User; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java index dccf1f3db9c5..55629a6ed0b9 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java @@ -1,22 +1,24 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A category for a pet - **/ + * A category for a pet + */ @ApiModel(description="A category for a pet") public class Category { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java index 43e7bd9e4329..85573619906a 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,25 +1,28 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Describes the result of uploading an image resource - **/ + * Describes the result of uploading an image resource + */ @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code; @ApiModelProperty(value = "") + private String type; @ApiModelProperty(value = "") + private String message; /** * Get code diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java index ab98465791c0..e7c2d133029e 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java @@ -1,29 +1,33 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import java.util.Date; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * An order for a pets from the pet store - **/ + * An order for a pets from the pet store + */ @ApiModel(description="An order for a pets from the pet store") public class Order { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Long petId; @ApiModelProperty(value = "") + private Integer quantity; @ApiModelProperty(value = "") + private Date shipDate; public enum StatusEnum { @@ -56,13 +60,15 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "Order Status") /** - * Order Status - **/ + * Order Status + */ + @ApiModelProperty(value = "Order Status") + private StatusEnum status; @ApiModelProperty(value = "") + private Boolean complete = false; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java index d9bc1cbd1979..cd541eada503 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java @@ -1,36 +1,41 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.model.Category; import org.openapitools.model.Tag; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A pet for sale in the pet store - **/ + * A pet for sale in the pet store + */ @ApiModel(description="A pet for sale in the pet store") public class Pet { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Category category; @ApiModelProperty(example = "doggie", required = true, value = "") + private String name; @ApiModelProperty(required = true, value = "") + private List photoUrls = new ArrayList<>(); @ApiModelProperty(value = "") + private List tags; public enum StatusEnum { @@ -63,10 +68,11 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "pet status in the store") /** - * pet status in the store - **/ + * pet status in the store + */ + @ApiModelProperty(value = "pet status in the store") + private StatusEnum status; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java index 9c011ae12b41..81b61d461cfe 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java @@ -1,22 +1,24 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A tag for a pet - **/ + * A tag for a pet + */ @ApiModel(description="A tag for a pet") public class Tag { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java index 001a0b7437b4..a27f47d99ce5 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java @@ -1,43 +1,51 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A User who is purchasing from the pet store - **/ + * A User who is purchasing from the pet store + */ @ApiModel(description="A User who is purchasing from the pet store") public class User { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String username; @ApiModelProperty(value = "") + private String firstName; @ApiModelProperty(value = "") + private String lastName; @ApiModelProperty(value = "") + private String email; @ApiModelProperty(value = "") + private String password; @ApiModelProperty(value = "") + private String phone; - @ApiModelProperty(value = "User Status") /** - * User Status - **/ + * User Status + */ + @ApiModelProperty(value = "User Status") + private Integer userStatus; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index 943012770159..c36ff13c9156 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -212,7 +212,7 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.22 + 1.6.6 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java index 6d16c4d9d8f3..51a1f65700f1 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java @@ -4,13 +4,9 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java index 820d6ef7672e..d516e13f14e9 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/StoreApi.java @@ -3,13 +3,9 @@ import java.util.Map; import org.openapitools.model.Order; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java index f6adeea7ab07..71f3028317f3 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/UserApi.java @@ -3,13 +3,9 @@ import java.util.Date; import org.openapitools.model.User; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java index 0f5f31cb9f40..c366f40681d8 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java @@ -1,24 +1,26 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A category for a pet - **/ + * A category for a pet + */ @ApiModel(description="A category for a pet") public class Category { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java index ec293afce473..ebf9005823f3 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,28 +1,31 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Describes the result of uploading an image resource - **/ + * Describes the result of uploading an image resource + */ @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code; @ApiModelProperty(value = "") + private String type; @ApiModelProperty(value = "") + private String message; /** * Get code diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java index 434d1626cdaa..a4a5ba29a53c 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java @@ -2,32 +2,36 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.Date; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * An order for a pets from the pet store - **/ + * An order for a pets from the pet store + */ @ApiModel(description="An order for a pets from the pet store") public class Order { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Long petId; @ApiModelProperty(value = "") + private Integer quantity; @ApiModelProperty(value = "") + private Date shipDate; public enum StatusEnum { @@ -62,13 +66,15 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "Order Status") /** - * Order Status - **/ + * Order Status + */ + @ApiModelProperty(value = "Order Status") + private StatusEnum status; @ApiModelProperty(value = "") + private Boolean complete = false; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java index 71af8d8a4ced..a83691dbfe79 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -11,32 +10,40 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A pet for sale in the pet store - **/ + * A pet for sale in the pet store + */ @ApiModel(description="A pet for sale in the pet store") public class Pet { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + @Valid + private Category category; @ApiModelProperty(example = "doggie", required = true, value = "") + private String name; @ApiModelProperty(required = true, value = "") + private List photoUrls = new ArrayList<>(); @ApiModelProperty(value = "") + @Valid + private List<@Valid Tag> tags; public enum StatusEnum { @@ -71,10 +78,11 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "pet status in the store") /** - * pet status in the store - **/ + * pet status in the store + */ + @ApiModelProperty(value = "pet status in the store") + private StatusEnum status; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java index 9bbfff095da7..e7ef41df3e53 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java @@ -1,24 +1,26 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A tag for a pet - **/ + * A tag for a pet + */ @ApiModel(description="A tag for a pet") public class Tag { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java index 0225ae5d27c0..7475969c2f28 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java @@ -1,45 +1,53 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A User who is purchasing from the pet store - **/ + * A User who is purchasing from the pet store + */ @ApiModel(description="A User who is purchasing from the pet store") public class User { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String username; @ApiModelProperty(value = "") + private String firstName; @ApiModelProperty(value = "") + private String lastName; @ApiModelProperty(value = "") + private String email; @ApiModelProperty(value = "") + private String password; @ApiModelProperty(value = "") + private String phone; - @ApiModelProperty(value = "User Status") /** - * User Status - **/ + * User Status + */ + @ApiModelProperty(value = "User Status") + private Integer userStatus; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index 3b93fa950404..59d9db802f7a 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -212,7 +212,7 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.22 + 1.6.6 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java index 02eb80853a28..3e6cf5c6a78b 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java @@ -4,13 +4,9 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java index 96b4b99c441d..7f4e93db7974 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/StoreApi.java @@ -3,13 +3,9 @@ import java.util.Map; import org.openapitools.model.Order; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java index 654b752edcf2..06e581ae5709 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/UserApi.java @@ -3,13 +3,9 @@ import java.util.Date; import org.openapitools.model.User; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java index 0f5f31cb9f40..c366f40681d8 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java @@ -1,24 +1,26 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A category for a pet - **/ + * A category for a pet + */ @ApiModel(description="A category for a pet") public class Category { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java index ec293afce473..ebf9005823f3 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -1,28 +1,31 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Describes the result of uploading an image resource - **/ + * Describes the result of uploading an image resource + */ @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code; @ApiModelProperty(value = "") + private String type; @ApiModelProperty(value = "") + private String message; /** * Get code diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java index 434d1626cdaa..a4a5ba29a53c 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java @@ -2,32 +2,36 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.Date; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * An order for a pets from the pet store - **/ + * An order for a pets from the pet store + */ @ApiModel(description="An order for a pets from the pet store") public class Order { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Long petId; @ApiModelProperty(value = "") + private Integer quantity; @ApiModelProperty(value = "") + private Date shipDate; public enum StatusEnum { @@ -62,13 +66,15 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "Order Status") /** - * Order Status - **/ + * Order Status + */ + @ApiModelProperty(value = "Order Status") + private StatusEnum status; @ApiModelProperty(value = "") + private Boolean complete = false; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java index 71af8d8a4ced..a83691dbfe79 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import io.swagger.annotations.ApiModel; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -11,32 +10,40 @@ import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A pet for sale in the pet store - **/ + * A pet for sale in the pet store + */ @ApiModel(description="A pet for sale in the pet store") public class Pet { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + @Valid + private Category category; @ApiModelProperty(example = "doggie", required = true, value = "") + private String name; @ApiModelProperty(required = true, value = "") + private List photoUrls = new ArrayList<>(); @ApiModelProperty(value = "") + @Valid + private List<@Valid Tag> tags; public enum StatusEnum { @@ -71,10 +78,11 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "pet status in the store") /** - * pet status in the store - **/ + * pet status in the store + */ + @ApiModelProperty(value = "pet status in the store") + private StatusEnum status; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java index 9bbfff095da7..e7ef41df3e53 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java @@ -1,24 +1,26 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A tag for a pet - **/ + * A tag for a pet + */ @ApiModel(description="A tag for a pet") public class Tag { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java index 0225ae5d27c0..7475969c2f28 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java @@ -1,45 +1,53 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * A User who is purchasing from the pet store - **/ + * A User who is purchasing from the pet store + */ @ApiModel(description="A User who is purchasing from the pet store") public class User { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String username; @ApiModelProperty(value = "") + private String firstName; @ApiModelProperty(value = "") + private String lastName; @ApiModelProperty(value = "") + private String email; @ApiModelProperty(value = "") + private String password; @ApiModelProperty(value = "") + private String phone; - @ApiModelProperty(value = "User Status") /** - * User Status - **/ + * User Status + */ + @ApiModelProperty(value = "User Status") + private Integer userStatus; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 338e801642db..4a7e74580421 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -212,7 +212,7 @@ for this project used jakarta.validation-api --> 1.8 ${java.version} ${java.version} - 1.5.22 + 1.6.6 9.2.9.v20150224 4.13.2 1.4.14 diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/AnotherFakeApi.java index a86464d95905..e463b5b013b8 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -3,13 +3,9 @@ import org.openapitools.model.Client; import java.util.UUID; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java index fc6c48b50d6c..287f3b59203f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java @@ -11,13 +11,9 @@ import org.openapitools.model.User; import org.openapitools.model.XmlItem; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java index 9b593bee6ad2..413705721eeb 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -2,13 +2,9 @@ import org.openapitools.model.Client; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 70ecf6c958c7..551d03b0cd2f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -5,13 +5,9 @@ import org.openapitools.model.Pet; import java.util.Set; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java index 9cfd254736aa..2bf9df04cc1b 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/StoreApi.java @@ -3,13 +3,9 @@ import java.util.Map; import org.openapitools.model.Order; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java index 6485b2345f41..df7df60c82f6 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/UserApi.java @@ -3,13 +3,9 @@ import java.util.Date; import org.openapitools.model.User; -import java.io.InputStream; -import java.io.OutputStream; import java.util.List; import java.util.Map; import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.*; import io.swagger.annotations.Api; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java index fa1f1664982e..d502d49462c4 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -13,6 +13,7 @@ public class AdditionalPropertiesAnyType extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java index 7b6df75d5996..b970ecd72ded 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -14,6 +14,7 @@ public class AdditionalPropertiesArray extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 521452f796a7..36815cbe6884 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -13,6 +13,7 @@ public class AdditionalPropertiesBoolean extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java index 3a8a99907b67..25a78f360b64 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -15,41 +15,57 @@ public class AdditionalPropertiesClass { @ApiModelProperty(value = "") + private Map mapString = new HashMap<>(); @ApiModelProperty(value = "") + @Valid + private Map mapNumber = new HashMap<>(); @ApiModelProperty(value = "") + private Map mapInteger = new HashMap<>(); @ApiModelProperty(value = "") + private Map mapBoolean = new HashMap<>(); @ApiModelProperty(value = "") + @Valid + private Map> mapArrayInteger = new HashMap<>(); @ApiModelProperty(value = "") + @Valid + private Map> mapArrayAnytype = new HashMap<>(); @ApiModelProperty(value = "") + @Valid + private Map> mapMapString = new HashMap<>(); @ApiModelProperty(value = "") + @Valid + private Map> mapMapAnytype = new HashMap<>(); @ApiModelProperty(value = "") + private Object anytype1; @ApiModelProperty(value = "") + private Object anytype2; @ApiModelProperty(value = "") + private Object anytype3; /** * Get mapString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java index d3a9c5bc078f..f03f9b02b870 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -13,6 +13,7 @@ public class AdditionalPropertiesInteger extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java index 9323fb33b1ba..447f016c5562 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -14,6 +14,7 @@ public class AdditionalPropertiesNumber extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java index 9b18e93bcdde..1d474b228645 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -13,6 +13,7 @@ public class AdditionalPropertiesObject extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java index 9011af6958e5..1f9d1fab755e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java @@ -13,6 +13,7 @@ public class AdditionalPropertiesString extends HashMap { @ApiModelProperty(value = "") + private String name; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java index f4aa77c5ebf4..df698533b477 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java @@ -20,9 +20,11 @@ public class Animal { @ApiModelProperty(required = true, value = "") + private String className; @ApiModelProperty(value = "") + private String color = "red"; /** * Get className diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index 3e877b82d549..e52b766ca65b 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -15,7 +15,9 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") + @Valid + private List> arrayArrayNumber; /** * Get arrayArrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java index 6261829241c1..8af944d3180d 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -15,7 +15,9 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") + @Valid + private List arrayNumber; /** * Get arrayNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java index 8ff058a6d4cf..5499c13f468f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java @@ -15,14 +15,19 @@ public class ArrayTest { @ApiModelProperty(value = "") + private List arrayOfString; @ApiModelProperty(value = "") + @Valid + private List> arrayArrayOfInteger; @ApiModelProperty(value = "") + @Valid + private List> arrayArrayOfModel; /** * Get arrayOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/BigCat.java index bc9fb8209a8c..f089bc64dbb4 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/BigCat.java @@ -46,6 +46,7 @@ public static KindEnum fromValue(String value) { } @ApiModelProperty(value = "") + private KindEnum kind; /** * Get kind diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java index a18160eef0ce..68c92bc6b89f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java @@ -11,24 +11,30 @@ public class Capitalization { @ApiModelProperty(value = "") + private String smallCamel; @ApiModelProperty(value = "") + private String capitalCamel; @ApiModelProperty(value = "") + private String smallSnake; @ApiModelProperty(value = "") + private String capitalSnake; @ApiModelProperty(value = "") + private String scAETHFlowPoints; - @ApiModelProperty(value = "Name of the pet ") /** - * Name of the pet - **/ + * Name of the pet + */ + @ApiModelProperty(value = "Name of the pet ") + private String ATT_NAME; /** * Get smallCamel diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java index 92827966e811..84a4f7177306 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java @@ -12,6 +12,7 @@ public class Cat extends Animal { @ApiModelProperty(value = "") + private Boolean declawed; /** * Get declawed diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java index a16c3ffd45f0..7af9db7265ea 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java @@ -11,9 +11,11 @@ public class Category { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(required = true, value = "") + private String name = "default-name"; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java index 234e1f14a3b5..bde081295bd6 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java @@ -1,21 +1,22 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Model for testing model with \"_class\" property - **/ + * Model for testing model with \"_class\" property + */ @ApiModel(description="Model for testing model with \"_class\" property") public class ClassModel { @ApiModelProperty(value = "") + private String propertyClass; /** * Get propertyClass diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java index c80c3ebb4814..2c09cb21b3f5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java @@ -11,6 +11,7 @@ public class Client { @ApiModelProperty(value = "") + private String client; /** * Get client diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java index 4047607c00f8..c92d97ba2962 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java @@ -12,6 +12,7 @@ public class Dog extends Animal { @ApiModelProperty(value = "") + private String breed; /** * Get breed diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java index 10ec68c1a808..5c881910469a 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java @@ -48,6 +48,7 @@ public static JustSymbolEnum fromValue(String value) { } @ApiModelProperty(value = "") + private JustSymbolEnum justSymbol; public enum ArrayEnumEnum { @@ -83,6 +84,7 @@ public static ArrayEnumEnum fromValue(String value) { } @ApiModelProperty(value = "") + private List arrayEnum; /** * Get justSymbol diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java index 7f90af814ecc..70aba52508c3 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java @@ -47,6 +47,7 @@ public static EnumStringEnum fromValue(String value) { } @ApiModelProperty(value = "") + private EnumStringEnum enumString; public enum EnumStringRequiredEnum { @@ -82,6 +83,7 @@ public static EnumStringRequiredEnum fromValue(String value) { } @ApiModelProperty(required = true, value = "") + private EnumStringRequiredEnum enumStringRequired; public enum EnumIntegerEnum { @@ -117,6 +119,7 @@ public static EnumIntegerEnum fromValue(Integer value) { } @ApiModelProperty(value = "") + private EnumIntegerEnum enumInteger; public enum EnumNumberEnum { @@ -152,10 +155,13 @@ public static EnumNumberEnum fromValue(Double value) { } @ApiModelProperty(value = "") + private EnumNumberEnum enumNumber; @ApiModelProperty(value = "") + @Valid + private OuterEnum outerEnum; /** * Get enumString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java index 14c7478308fa..09c9b39e2df8 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java @@ -15,11 +15,15 @@ public class FileSchemaTestClass { @ApiModelProperty(value = "") + @Valid + private ModelFile _file; @ApiModelProperty(value = "") + @Valid + private List<@Valid ModelFile> files; /** * Get _file diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java index 976d985f42b9..f45cfce39fbb 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java @@ -17,47 +17,63 @@ public class FormatTest { @ApiModelProperty(value = "") + private Integer integer; @ApiModelProperty(value = "") + private Integer int32; @ApiModelProperty(value = "") + private Long int64; @ApiModelProperty(required = true, value = "") + @Valid + private BigDecimal number; @ApiModelProperty(value = "") + private Float _float; @ApiModelProperty(value = "") + private Double _double; @ApiModelProperty(value = "") + private String string; @ApiModelProperty(required = true, value = "") + private byte[] _byte; @ApiModelProperty(value = "") + private File binary; @ApiModelProperty(required = true, value = "") + private LocalDate date; @ApiModelProperty(value = "") + private Date dateTime; @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") + private UUID uuid; @ApiModelProperty(required = true, value = "") + private String password; @ApiModelProperty(value = "") + @Valid + private BigDecimal bigDecimal; /** * Get integer diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java index da75bd675d9f..ca06a2b7f003 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java @@ -12,9 +12,11 @@ public class HasOnlyReadOnly { @ApiModelProperty(value = "") + private String bar; @ApiModelProperty(value = "") + private String foo; /** * Get bar diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java index 3e56ff41c90c..3b5413bd100e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java @@ -15,7 +15,9 @@ public class MapTest { @ApiModelProperty(value = "") + @Valid + private Map> mapMapOfString = new HashMap<>(); public enum InnerEnum { @@ -51,12 +53,15 @@ public static InnerEnum fromValue(String value) { } @ApiModelProperty(value = "") + private Map mapOfEnumString = new HashMap<>(); @ApiModelProperty(value = "") + private Map directMap = new HashMap<>(); @ApiModelProperty(value = "") + private Map indirectMap = new HashMap<>(); /** * Get mapMapOfString diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 6b4c41db1c19..297fa8c86a22 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -16,13 +16,17 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") + private UUID uuid; @ApiModelProperty(value = "") + private Date dateTime; @ApiModelProperty(value = "") + @Valid + private Map map = new HashMap<>(); /** * Get uuid diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java index 92bfe32725f4..4461f378a4a5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java @@ -1,25 +1,27 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Model for testing model name starting with number - **/ + * Model for testing model name starting with number + */ @ApiModel(description="Model for testing model name starting with number") public class Model200Response { @ApiModelProperty(value = "") + private Integer name; @ApiModelProperty(value = "") + private String propertyClass; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java index 4358dffbccaa..13e0ee26e931 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java @@ -12,12 +12,15 @@ public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code; @ApiModelProperty(value = "") + private String type; @ApiModelProperty(value = "") + private String message; /** * Get code diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelFile.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelFile.java index 2b81e049d786..ebeb6e0e6f48 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelFile.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelFile.java @@ -1,25 +1,26 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Must be named `File` for test. - **/ + * Must be named `File` for test. + */ @ApiModel(description="Must be named `File` for test.") public class ModelFile { - @ApiModelProperty(value = "Test capitalization") /** - * Test capitalization - **/ + * Test capitalization + */ + @ApiModelProperty(value = "Test capitalization") + private String sourceURI; /** * Test capitalization diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelList.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelList.java index b3bada4f240f..4cb22ef9858c 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelList.java @@ -12,6 +12,7 @@ public class ModelList { @ApiModelProperty(value = "") + private String _123list; /** * Get _123list diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java index 67c0fc5d96d5..7be3c8ef1c99 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java @@ -1,22 +1,23 @@ package org.openapitools.model; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Model for testing reserved words - **/ + * Model for testing reserved words + */ @ApiModel(description="Model for testing reserved words") public class ModelReturn { @ApiModelProperty(value = "") + private Integer _return; /** * Get _return diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java index 6f474dac56bd..fc9394f7ff7f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java @@ -1,30 +1,34 @@ package org.openapitools.model; -import io.swagger.annotations.ApiModel; import javax.validation.constraints.*; import javax.validation.Valid; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; /** - * Model for testing model name same as property name - **/ + * Model for testing model name same as property name + */ @ApiModel(description="Model for testing model name same as property name") public class Name { @ApiModelProperty(required = true, value = "") + private Integer name; @ApiModelProperty(value = "") + private Integer snakeCase; @ApiModelProperty(value = "") + private String property; @ApiModelProperty(value = "") + private Integer _123number; /** * Get name diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java index 52c94fde2346..780fdfd57fb6 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java @@ -12,7 +12,9 @@ public class NumberOnly { @ApiModelProperty(value = "") + @Valid + private BigDecimal justNumber; /** * Get justNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java index 2ce1523b5070..0d4f8f8f4045 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java @@ -14,15 +14,19 @@ public class Order { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private Long petId; @ApiModelProperty(value = "") + private Integer quantity; @ApiModelProperty(value = "") + private Date shipDate; public enum StatusEnum { @@ -57,13 +61,15 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "Order Status") /** - * Order Status - **/ + * Order Status + */ + @ApiModelProperty(value = "Order Status") + private StatusEnum status; @ApiModelProperty(value = "") + private Boolean complete = false; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java index ee28549b3ea6..43eb7d920d68 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java @@ -12,13 +12,17 @@ public class OuterComposite { @ApiModelProperty(value = "") + @Valid + private BigDecimal myNumber; @ApiModelProperty(value = "") + private String myString; @ApiModelProperty(value = "") + private Boolean myBoolean; /** * Get myNumber diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java index f18417662b84..d1303118ebed 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java @@ -21,20 +21,27 @@ public class Pet { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + @Valid + private Category category; @ApiModelProperty(example = "doggie", required = true, value = "") + private String name; @ApiModelProperty(required = true, value = "") + private Set photoUrls = new LinkedHashSet<>(); @ApiModelProperty(value = "") + @Valid + private List<@Valid Tag> tags; public enum StatusEnum { @@ -69,10 +76,11 @@ public static StatusEnum fromValue(String value) { } } - @ApiModelProperty(value = "pet status in the store") /** - * pet status in the store - **/ + * pet status in the store + */ + @ApiModelProperty(value = "pet status in the store") + private StatusEnum status; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java index 48870cd6e5b8..b04aadde51ef 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java @@ -11,9 +11,11 @@ public class ReadOnlyFirst { @ApiModelProperty(value = "") + private String bar; @ApiModelProperty(value = "") + private String baz; /** * Get bar diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java index 63b78c36a6ae..aab10cc98ce9 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java @@ -12,6 +12,7 @@ public class SpecialModelName { @ApiModelProperty(value = "") + private Long $specialPropertyName; /** * Get $specialPropertyName diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java index da552b1ec331..7675b17cd4c5 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java @@ -11,9 +11,11 @@ public class Tag { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String name; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java index d85f401a6716..33d455e2af2e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java @@ -15,19 +15,25 @@ public class TypeHolderDefault { @ApiModelProperty(required = true, value = "") + private String stringItem = "what"; @ApiModelProperty(required = true, value = "") + @Valid + private BigDecimal numberItem; @ApiModelProperty(required = true, value = "") + private Integer integerItem; @ApiModelProperty(required = true, value = "") + private Boolean boolItem = true; @ApiModelProperty(required = true, value = "") + private List arrayItem = new ArrayList<>(); /** * Get stringItem diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java index 0f25d81ac331..e32345c8d7da 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java @@ -15,22 +15,29 @@ public class TypeHolderExample { @ApiModelProperty(example = "what", required = true, value = "") + private String stringItem; @ApiModelProperty(example = "1.234", required = true, value = "") + @Valid + private BigDecimal numberItem; @ApiModelProperty(example = "1.234", required = true, value = "") + private Float floatItem; @ApiModelProperty(example = "-2", required = true, value = "") + private Integer integerItem; @ApiModelProperty(example = "true", required = true, value = "") + private Boolean boolItem; @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") + private List arrayItem = new ArrayList<>(); /** * Get stringItem diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java index 83633445d073..30371dbe56c7 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java @@ -11,30 +11,38 @@ public class User { @ApiModelProperty(value = "") + private Long id; @ApiModelProperty(value = "") + private String username; @ApiModelProperty(value = "") + private String firstName; @ApiModelProperty(value = "") + private String lastName; @ApiModelProperty(value = "") + private String email; @ApiModelProperty(value = "") + private String password; @ApiModelProperty(value = "") + private String phone; - @ApiModelProperty(value = "User Status") /** - * User Status - **/ + * User Status + */ + @ApiModelProperty(value = "User Status") + private Integer userStatus; /** * Get id diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java index 09909e884079..9a8107ed5466 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java @@ -15,95 +15,129 @@ public class XmlItem { @ApiModelProperty(example = "string", value = "") + private String attributeString; @ApiModelProperty(example = "1.234", value = "") + @Valid + private BigDecimal attributeNumber; @ApiModelProperty(example = "-2", value = "") + private Integer attributeInteger; @ApiModelProperty(example = "true", value = "") + private Boolean attributeBoolean; @ApiModelProperty(value = "") + private List wrappedArray; @ApiModelProperty(example = "string", value = "") + private String nameString; @ApiModelProperty(example = "1.234", value = "") + @Valid + private BigDecimal nameNumber; @ApiModelProperty(example = "-2", value = "") + private Integer nameInteger; @ApiModelProperty(example = "true", value = "") + private Boolean nameBoolean; @ApiModelProperty(value = "") + private List nameArray; @ApiModelProperty(value = "") + private List nameWrappedArray; @ApiModelProperty(example = "string", value = "") + private String prefixString; @ApiModelProperty(example = "1.234", value = "") + @Valid + private BigDecimal prefixNumber; @ApiModelProperty(example = "-2", value = "") + private Integer prefixInteger; @ApiModelProperty(example = "true", value = "") + private Boolean prefixBoolean; @ApiModelProperty(value = "") + private List prefixArray; @ApiModelProperty(value = "") + private List prefixWrappedArray; @ApiModelProperty(example = "string", value = "") + private String namespaceString; @ApiModelProperty(example = "1.234", value = "") + @Valid + private BigDecimal namespaceNumber; @ApiModelProperty(example = "-2", value = "") + private Integer namespaceInteger; @ApiModelProperty(example = "true", value = "") + private Boolean namespaceBoolean; @ApiModelProperty(value = "") + private List namespaceArray; @ApiModelProperty(value = "") + private List namespaceWrappedArray; @ApiModelProperty(example = "string", value = "") + private String prefixNsString; @ApiModelProperty(example = "1.234", value = "") + @Valid + private BigDecimal prefixNsNumber; @ApiModelProperty(example = "-2", value = "") + private Integer prefixNsInteger; @ApiModelProperty(example = "true", value = "") + private Boolean prefixNsBoolean; @ApiModelProperty(value = "") + private List prefixNsArray; @ApiModelProperty(value = "") + private List prefixNsWrappedArray; /** * Get attributeString