diff --git a/bin/java-petstore-rest-assured.sh b/bin/java-petstore-rest-assured.sh index cacc3cf3c279..93de0703ed77 100755 --- a/bin/java-petstore-rest-assured.sh +++ b/bin/java-petstore-rest-assured.sh @@ -27,7 +27,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/rest-assured -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-rest-assured.json -o samples/client/petstore/java/rest-assured --additional-properties hideGenerationTimestamp=true --additional-properties booleanGetterPrefix=is $@" +ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/rest-assured -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-rest-assured.json -o samples/client/petstore/java/rest-assured --additional-properties hideGenerationTimestamp=true --additional-properties useBeanValidation=true --additional-properties performBeanValidation=true --additional-properties booleanGetterPrefix=is $@" echo "Removing files and folders under samples/client/petstore/java/rest-assured/src/main" rm -rf samples/client/petstore/java/rest-assured/src/main diff --git a/docs/customization.md b/docs/customization.md index 14fdd1a7f2c2..fbdc5a890cdb 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -248,7 +248,7 @@ CONFIG OPTIONS retrofit - HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0) retrofit2 - HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2) google-api-client - HTTP client: google-api-client 1.23.0. JSON processing: Jackson 2.8.9 - rest-assured - HTTP client: rest-assured : 4.0.0. JSON processing: Gson 2.8.5. Only for Java8 + rest-assured - HTTP client: rest-assured : 4.3.0. JSON processing: Gson 2.8.6. Only for Java8 ``` Your config file for Java can look like diff --git a/docs/generators/java.md b/docs/generators/java.md index c97d5e24d4e3..9cac5e18dfec 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -28,7 +28,7 @@ sidebar_label: java |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false| |invokerPackage|root package for generated code| |org.openapitools.client| |java8|Option. Use Java8 classes instead of third party equivalents|
**true**
Use Java 8 classes such as Base64
**false**
Various third party libraries as needed
|false| -|library|library template (sub-template) to use|
**jersey1**
HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.
**jersey2**
HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
**feign**
HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.
**okhttp-gson**
[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.
**retrofit**
HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.
**retrofit2**
HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)
**resttemplate**
HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
**webclient**
HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
**resteasy**
HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
**vertx**
HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
**google-api-client**
HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
**rest-assured**
HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.9.x. Only for Java8
**native**
HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
**microprofile**
HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x
|okhttp-gson| +|library|library template (sub-template) to use|
**jersey1**
HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.
**jersey2**
HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
**feign**
HTTP client: OpenFeign 9.x (deprecated) or 10.x (default). JSON processing: Jackson 2.9.x.
**okhttp-gson**
[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.
**retrofit**
HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.
**retrofit2**
HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)
**resttemplate**
HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
**webclient**
HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
**resteasy**
HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
**vertx**
HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
**google-api-client**
HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
**rest-assured**
HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8
**native**
HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
**microprofile**
HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x
|okhttp-gson| |licenseName|The name of the license| |Unlicense| |licenseUrl|The URL of the license| |http://unlicense.org| |modelPackage|package for generated models| |org.openapitools.client.model| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 8836f1b7e660..58134a28b1ef 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -153,7 +153,7 @@ public JavaClientCodegen() { supportedLibraries.put(RESTEASY, "HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x"); supportedLibraries.put(VERTX, "HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x"); supportedLibraries.put(GOOGLE_API_CLIENT, "HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x"); - supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.9.x. Only for Java8"); + supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8"); supportedLibraries.put(NATIVE, "HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+"); supportedLibraries.put(MICROPROFILE, "HTTP client: Microprofile client X.x. JSON processing: Jackson 2.9.x"); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index b04e53f1e966..640ad1cd18ca 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -96,24 +96,24 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.21" - rest_assured_version = "4.0.0" + rest_assured_version = "4.3.0" junit_version = "4.13" {{#jackson}} - jackson_version = "2.10.1" - jackson_databind_version = "2.9.10" + jackson_version = "2.10.3" + jackson_databind_version = "2.10.3" jackson_databind_nullable_version = 0.2.1 {{/jackson}} {{#gson}} - gson_version = "2.8.5" - gson_fire_version = "1.8.3" + gson_version = "2.8.6" + gson_fire_version = "1.8.4" {{/gson}} {{#joda}} - jodatime_version = "2.9.9" + jodatime_version = "2.10.5" {{/joda}} {{#threetenbp}} - threetenbp_version = "1.4.0" + threetenbp_version = "1.4.3" {{/threetenbp}} - okio_version = "1.13.0" + okio_version = "1.17.5" } dependencies { @@ -138,5 +138,11 @@ dependencies { compile "org.threeten:threetenbp:$threetenbp_version" {{/threetenbp}} compile "com.squareup.okio:okio:$okio_version" +{{#useBeanValidation}} + compile "javax.validation:validation-api:2.0.1.Final" +{{/useBeanValidation}} +{{#performBeanValidation}} + compile "org.hibernate:hibernate-validator:6.0.19.Final" +{{/performBeanValidation}} testCompile "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache index 71f2eaeeba24..77f8af4f436e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache @@ -10,23 +10,29 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.5.21", - "io.rest-assured" % "scala-support" % "4.0.0", + "io.rest-assured" % "scala-support" % "4.3.0", {{#jackson}} - "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile", {{/jackson}} {{#gson}} - "com.google.code.gson" % "gson" % "2.8.5", - "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", + "com.google.code.gson" % "gson" % "2.8.6", + "io.gsonfire" % "gson-fire" % "1.8.4" % "compile", {{/gson}} {{#joda}} - "joda-time" % "joda-time" % "2.9.9" % "compile", + "joda-time" % "joda-time" % "2.10.5" % "compile", {{/joda}} {{#threetenbp}} - "org.threeten" % "threetenbp" % "1.4.0" % "compile", + "org.threeten" % "threetenbp" % "1.4.3" % "compile", {{/threetenbp}} - "com.squareup.okio" % "okio" % "1.13.0" % "compile", + "com.squareup.okio" % "okio" % "1.17.5" % "compile", +{{#useBeanValidation}} + "javax.validation" % "validation-api" % "2.0.1.Final" % "compile", +{{/useBeanValidation}} +{{#performBeanValidation}} + "org.hibernate" % "hibernate-validator" "6.0.19.Final" % "compile", +{{/performBeanValidation}} "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index da538caa9b06..2e68695d431a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -43,7 +43,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 + 3.0.0-M3 enforce-maven @@ -53,7 +53,7 @@ - 2.2.0 + 3.0.5 @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 2.22.2 @@ -71,9 +71,8 @@ conf/log4j.properties - -Xms512m -Xmx1500m - methods - pertest + false + 1C @@ -111,6 +110,7 @@ org.codehaus.mojo build-helper-maven-plugin + 3.1.0 add_sources @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.1 1.8 1.8 @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 none @@ -166,7 +166,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.0 attach-sources @@ -187,7 +187,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts @@ -203,6 +203,20 @@ + {{#jackson}} + + + + com.fasterxml.jackson + jackson-bom + ${jackson-version} + pom + import + + + + {{/jackson}} + io.swagger @@ -215,6 +229,14 @@ jsr305 3.0.2 + {{^hideGenerationTimestamp}} + + javax.annotation + javax.annotation-api + 1.3.2 + provided + + {{/hideGenerationTimestamp}} io.rest-assured rest-assured @@ -253,17 +275,14 @@ com.fasterxml.jackson.core jackson-core - ${jackson-version} com.fasterxml.jackson.core jackson-annotations - ${jackson-version} com.fasterxml.jackson.core jackson-databind - ${jackson-databind-version} org.openapitools @@ -274,21 +293,18 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${jackson-version} {{/withXml}} {{#joda}} com.fasterxml.jackson.datatype jackson-datatype-joda - ${jackson-version} {{/joda}} {{#java8}} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson-version} {{/java8}} {{#threetenbp}} @@ -304,6 +320,23 @@ okio ${okio-version} + {{#useBeanValidation}} + + + javax.validation + validation-api + 2.0.1.Final + provided + + {{/useBeanValidation}} + {{#performBeanValidation}} + + + org.hibernate + hibernate-validator + 6.0.19.Final + + {{/performBeanValidation}} junit @@ -315,25 +348,23 @@ UTF-8 1.5.21 - 4.0.0 - 2.8.5 - 1.8.3 - 1.0.0 + 4.3.0 + 2.8.6 + 1.8.4 {{#joda}} - 2.9.9 + 2.10.5 {{/joda}} {{#threetenbp}} - 1.4.0 + 1.4.3 {{/threetenbp}} {{#jackson}} - 2.10.1 - 2.9.10 + 2.10.3 0.2.1 {{#threetenbp}} - 2.9.10 + 2.10.0 {{/threetenbp}} {{/jackson}} - 1.13.0 + 1.17.5 4.13 diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index 67c6d784de84..015b0b676a84 100644 --- a/samples/client/petstore/java/rest-assured/build.gradle +++ b/samples/client/petstore/java/rest-assured/build.gradle @@ -96,12 +96,12 @@ if(hasProperty('target') && target == 'android') { ext { swagger_annotations_version = "1.5.21" - rest_assured_version = "4.0.0" + rest_assured_version = "4.3.0" junit_version = "4.13" - gson_version = "2.8.5" - gson_fire_version = "1.8.3" - threetenbp_version = "1.4.0" - okio_version = "1.13.0" + gson_version = "2.8.6" + gson_fire_version = "1.8.4" + threetenbp_version = "1.4.3" + okio_version = "1.17.5" } dependencies { @@ -112,5 +112,7 @@ dependencies { compile 'com.google.code.gson:gson:$gson_version' compile "org.threeten:threetenbp:$threetenbp_version" compile "com.squareup.okio:okio:$okio_version" + compile "javax.validation:validation-api:2.0.1.Final" + compile "org.hibernate:hibernate-validator:6.0.19.Final" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/rest-assured/build.sbt b/samples/client/petstore/java/rest-assured/build.sbt index 8777fcab7f57..980585522a9b 100644 --- a/samples/client/petstore/java/rest-assured/build.sbt +++ b/samples/client/petstore/java/rest-assured/build.sbt @@ -10,11 +10,13 @@ lazy val root = (project in file(".")). resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.swagger" % "swagger-annotations" % "1.5.21", - "io.rest-assured" % "scala-support" % "4.0.0", - "com.google.code.gson" % "gson" % "2.8.5", - "io.gsonfire" % "gson-fire" % "1.8.3" % "compile", - "org.threeten" % "threetenbp" % "1.4.0" % "compile", - "com.squareup.okio" % "okio" % "1.13.0" % "compile", + "io.rest-assured" % "scala-support" % "4.3.0", + "com.google.code.gson" % "gson" % "2.8.6", + "io.gsonfire" % "gson-fire" % "1.8.4" % "compile", + "org.threeten" % "threetenbp" % "1.4.3" % "compile", + "com.squareup.okio" % "okio" % "1.17.5" % "compile", + "javax.validation" % "validation-api" % "2.0.1.Final" % "compile", + "org.hibernate" % "hibernate-validator" "6.0.19.Final" % "compile", "junit" % "junit" % "4.13" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml index ffa51be6c211..21e224499c41 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M1 + 3.0.0-M3 enforce-maven @@ -46,7 +46,7 @@ - 2.2.0 + 3.0.5 @@ -56,7 +56,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.12 + 2.22.2 @@ -64,9 +64,8 @@ conf/log4j.properties - -Xms512m -Xmx1500m - methods - pertest + false + 1C @@ -104,6 +103,7 @@ org.codehaus.mojo build-helper-maven-plugin + 3.1.0 add_sources @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.1 1.8 1.8 @@ -143,7 +143,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 none @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.2.0 attach-sources @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts @@ -196,6 +196,7 @@ + io.swagger @@ -233,6 +234,19 @@ okio ${okio-version} + + + javax.validation + validation-api + 2.0.1.Final + provided + + + + org.hibernate + hibernate-validator + 6.0.19.Final + junit @@ -244,12 +258,11 @@ UTF-8 1.5.21 - 4.0.0 - 2.8.5 - 1.8.3 - 1.0.0 - 1.4.0 - 1.13.0 + 4.3.0 + 2.8.6 + 1.8.4 + 1.4.3 + 1.17.5 4.13 diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/BeanValidationException.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/BeanValidationException.java new file mode 100644 index 000000000000..28b41ac559e5 --- /dev/null +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/BeanValidationException.java @@ -0,0 +1,27 @@ +package org.openapitools.client; + +import java.util.Set; + +import javax.validation.ConstraintViolation; +import javax.validation.ValidationException; + +public class BeanValidationException extends ValidationException { + /** + * + */ + private static final long serialVersionUID = -5294733947409491364L; + Set> violations; + + public BeanValidationException(Set> violations) { + this.violations = violations; + } + + public Set> getViolations() { + return violations; + } + + public void setViolations(Set> violations) { + this.violations = violations; + } + +} diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 79c169543fde..aba19948f055 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesAnyType diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index e16ee861f893..bb35b0970ef4 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -26,6 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesArray diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index 29161b52aa16..b3528f7a8722 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesBoolean diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index a067b01ec979..9b270abdb56e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -27,6 +27,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesClass @@ -128,6 +131,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb * @return mapNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Map getMapNumber() { @@ -221,6 +225,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @@ -252,6 +257,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List * @return mapArrayAnytype **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Map> getMapArrayAnytype() { @@ -283,6 +289,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @@ -314,6 +321,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @@ -337,6 +345,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) { * @return anytype1 **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Object getAnytype1() { @@ -360,6 +369,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) { * @return anytype2 **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Object getAnytype2() { @@ -383,6 +393,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) { * @return anytype3 **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Object getAnytype3() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 3a15ed7cd977..574b6ad8f1bb 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesInteger diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index 9bc46e099916..c138d835e55a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesNumber diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index bd65f7791c5e..48bd74a65a60 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesObject diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index cdb8afedaaf4..8be8dcd782d6 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * AdditionalPropertiesString diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java index af469dda3f40..bb64354ab52e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Animal @@ -52,6 +55,7 @@ public Animal className(String className) { * Get className * @return className **/ + @NotNull @ApiModelProperty(required = true, value = "") public String getClassName() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index a6dd760660d5..9db163e71534 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * ArrayOfArrayOfNumberOnly @@ -56,6 +59,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr * @return arrayArrayNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List> getArrayArrayNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 487c539d3bac..02106b473bc8 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * ArrayOfNumberOnly @@ -56,6 +59,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { * @return arrayNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List getArrayNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java index 7d66ce233feb..4ec8e611d8c6 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -26,6 +26,9 @@ import java.util.ArrayList; import java.util.List; import org.openapitools.client.model.ReadOnlyFirst; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * ArrayTest @@ -95,6 +98,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * @return arrayArrayOfInteger **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfInteger() { @@ -126,6 +130,7 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI * @return arrayArrayOfModel **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List> getArrayArrayOfModel() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java index 74b7ddc8135b..14436bf9f98a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java @@ -25,6 +25,9 @@ import java.io.IOException; import org.openapitools.client.model.BigCatAllOf; import org.openapitools.client.model.Cat; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * BigCat diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java index cd2207704bd1..eaa296451029 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCatAllOf.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * BigCatAllOf diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java index d4fbec81c543..90db42f19630 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Capitalization diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java index e5a45ef03d89..1d89f2afd131 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java @@ -25,6 +25,9 @@ import java.io.IOException; import org.openapitools.client.model.Animal; import org.openapitools.client.model.CatAllOf; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Cat diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java index 3299c8ea8776..6061abfee808 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * CatAllOf diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java index 4d07c3a1bef1..1837174952ac 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Category @@ -71,6 +74,7 @@ public Category name(String name) { * Get name * @return name **/ + @NotNull @ApiModelProperty(required = true, value = "") public String getName() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java index 8867bdd06bf0..8bda0bd8381d 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Model for testing model with \"_class\" property diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java index 25831260e09b..e72113def905 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Client diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java index 89c8b6aba99b..174de6bb5bef 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java @@ -25,6 +25,9 @@ import java.io.IOException; import org.openapitools.client.model.Animal; import org.openapitools.client.model.DogAllOf; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Dog diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java index b945c2c33db4..dc2f0f751e63 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * DogAllOf diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java index 2512b4cf9d52..0fd2de659e99 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * EnumArrays diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java index b9a78241a5a7..ae6366ff6196 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java @@ -16,6 +16,9 @@ import java.util.Objects; import java.util.Arrays; import com.google.gson.annotations.SerializedName; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; import java.io.IOException; import com.google.gson.TypeAdapter; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java index ccbbabaa9ba5..5fa3c853a032 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java @@ -24,6 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import org.openapitools.client.model.OuterEnum; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * EnumTest @@ -276,6 +279,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) { * Get enumStringRequired * @return enumStringRequired **/ + @NotNull @ApiModelProperty(required = true, value = "") public EnumStringRequiredEnum getEnumStringRequired() { @@ -345,6 +349,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) { * @return outerEnum **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public OuterEnum getOuterEnum() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f4a15cd5b7fd..eb73f8f1e4a6 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -25,6 +25,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * FileSchemaTestClass @@ -51,6 +54,7 @@ public FileSchemaTestClass file(java.io.File file) { * @return file **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public java.io.File getFile() { @@ -82,6 +86,7 @@ public FileSchemaTestClass addFilesItem(java.io.File filesItem) { * @return files **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List getFiles() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java index 5983420c81b1..c05d5a9485e9 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java @@ -28,6 +28,9 @@ import java.util.UUID; import org.threeten.bp.LocalDate; import org.threeten.bp.OffsetDateTime; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * FormatTest @@ -104,7 +107,7 @@ public FormatTest integer(Integer integer) { * @return integer **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @Min(10) @Max(100) @ApiModelProperty(value = "") public Integer getInteger() { return integer; @@ -129,7 +132,7 @@ public FormatTest int32(Integer int32) { * @return int32 **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @Min(20) @Max(200) @ApiModelProperty(value = "") public Integer getInt32() { return int32; @@ -176,7 +179,9 @@ public FormatTest number(BigDecimal number) { * maximum: 543.2 * @return number **/ - @ApiModelProperty(required = true, value = "") + @NotNull + @Valid + @DecimalMin("32.1") @DecimalMax("543.2") @ApiModelProperty(required = true, value = "") public BigDecimal getNumber() { return number; @@ -201,7 +206,7 @@ public FormatTest _float(Float _float) { * @return _float **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @DecimalMin("54.3") @DecimalMax("987.6") @ApiModelProperty(value = "") public Float getFloat() { return _float; @@ -226,7 +231,7 @@ public FormatTest _double(Double _double) { * @return _double **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @DecimalMin("67.8") @DecimalMax("123.4") @ApiModelProperty(value = "") public Double getDouble() { return _double; @@ -249,7 +254,7 @@ public FormatTest string(String string) { * @return string **/ @javax.annotation.Nullable - @ApiModelProperty(value = "") + @Pattern(regexp="/[a-z]/i") @ApiModelProperty(value = "") public String getString() { return string; @@ -271,7 +276,8 @@ public FormatTest _byte(byte[] _byte) { * Get _byte * @return _byte **/ - @ApiModelProperty(required = true, value = "") + @NotNull + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @ApiModelProperty(required = true, value = "") public byte[] getByte() { return _byte; @@ -294,6 +300,7 @@ public FormatTest binary(File binary) { * @return binary **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public File getBinary() { @@ -316,6 +323,8 @@ public FormatTest date(LocalDate date) { * Get date * @return date **/ + @NotNull + @Valid @ApiModelProperty(required = true, value = "") public LocalDate getDate() { @@ -339,6 +348,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) { * @return dateTime **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -362,6 +372,7 @@ public FormatTest uuid(UUID uuid) { * @return uuid **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "") public UUID getUuid() { @@ -384,7 +395,8 @@ public FormatTest password(String password) { * Get password * @return password **/ - @ApiModelProperty(required = true, value = "") + @NotNull + @Size(min=10,max=64) @ApiModelProperty(required = true, value = "") public String getPassword() { return password; @@ -407,6 +419,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) { * @return bigDecimal **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public BigDecimal getBigDecimal() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 8fcb26846436..b5f9d033d1fc 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * HasOnlyReadOnly diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java index 7dc68b0ff00f..d2d1452e028a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java @@ -26,6 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * MapTest @@ -115,6 +118,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * @return mapMapOfString **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Map> getMapMapOfString() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 527853d7522c..ee8f4a7f9bb5 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -29,6 +29,9 @@ import java.util.UUID; import org.openapitools.client.model.Animal; import org.threeten.bp.OffsetDateTime; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * MixedPropertiesAndAdditionalPropertiesClass @@ -59,6 +62,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * @return uuid **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public UUID getUuid() { @@ -82,6 +86,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT * @return dateTime **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public OffsetDateTime getDateTime() { @@ -113,6 +118,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal * @return map **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Map getMap() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java index df3683dac78d..55328ed3accd 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Model for testing model name starting with number diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java index b9cf72823b2f..9fb06422b55f 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * ModelApiResponse diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java index 6e9714df977d..84afadc74399 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Model for testing reserved words diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java index 94117a9b0f4b..ddea46f4bf1e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Model for testing model name same as property name @@ -57,6 +60,7 @@ public Name name(Integer name) { * Get name * @return name **/ + @NotNull @ApiModelProperty(required = true, value = "") public Integer getName() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java index 9a55d8aa615f..5ea3f679be6f 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -24,6 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.math.BigDecimal; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * NumberOnly @@ -46,6 +49,7 @@ public NumberOnly justNumber(BigDecimal justNumber) { * @return justNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public BigDecimal getJustNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java index 4e41a3dc88ea..40eed7b5db9d 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java @@ -24,6 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import org.threeten.bp.OffsetDateTime; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Order @@ -184,6 +187,7 @@ public Order shipDate(OffsetDateTime shipDate) { * @return shipDate **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public OffsetDateTime getShipDate() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java index 96b1237f82fa..fef7f5812aa0 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -24,6 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.math.BigDecimal; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * OuterComposite @@ -54,6 +57,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * @return myNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public BigDecimal getMyNumber() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java index bd870812102c..be690856408e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -16,6 +16,9 @@ import java.util.Objects; import java.util.Arrays; import com.google.gson.annotations.SerializedName; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; import java.io.IOException; import com.google.gson.TypeAdapter; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..a20c1cfcdd5e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -27,6 +27,9 @@ import java.util.List; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Pet @@ -141,6 +144,7 @@ public Pet category(Category category) { * @return category **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public Category getCategory() { @@ -163,6 +167,7 @@ public Pet name(String name) { * Get name * @return name **/ + @NotNull @ApiModelProperty(example = "doggie", required = true, value = "") public String getName() { @@ -190,6 +195,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get photoUrls * @return photoUrls **/ + @NotNull @ApiModelProperty(required = true, value = "") public List getPhotoUrls() { @@ -221,6 +227,7 @@ public Pet addTagsItem(Tag tagsItem) { * @return tags **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(value = "") public List getTags() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index ed0244a3ca27..d034413519b5 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * ReadOnlyFirst diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java index 3405d30ff614..45f9e21f8b63 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * SpecialModelName diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java index 710e0fe54a4e..315b9180f676 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * Tag diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index b6cea1fd768c..bbe170f19845 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * TypeHolderDefault @@ -63,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) { * Get stringItem * @return stringItem **/ + @NotNull @ApiModelProperty(required = true, value = "") public String getStringItem() { @@ -85,6 +89,8 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem **/ + @NotNull + @Valid @ApiModelProperty(required = true, value = "") public BigDecimal getNumberItem() { @@ -107,6 +113,7 @@ public TypeHolderDefault integerItem(Integer integerItem) { * Get integerItem * @return integerItem **/ + @NotNull @ApiModelProperty(required = true, value = "") public Integer getIntegerItem() { @@ -129,6 +136,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) { * Get boolItem * @return boolItem **/ + @NotNull @ApiModelProperty(required = true, value = "") public Boolean isBoolItem() { @@ -156,6 +164,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem **/ + @NotNull @ApiModelProperty(required = true, value = "") public List getArrayItem() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 787d0123cce9..daa84d59ba9e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * TypeHolderExample @@ -67,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) { * Get stringItem * @return stringItem **/ + @NotNull @ApiModelProperty(example = "what", required = true, value = "") public String getStringItem() { @@ -89,6 +93,8 @@ public TypeHolderExample numberItem(BigDecimal numberItem) { * Get numberItem * @return numberItem **/ + @NotNull + @Valid @ApiModelProperty(example = "1.234", required = true, value = "") public BigDecimal getNumberItem() { @@ -111,6 +117,7 @@ public TypeHolderExample floatItem(Float floatItem) { * Get floatItem * @return floatItem **/ + @NotNull @ApiModelProperty(example = "1.234", required = true, value = "") public Float getFloatItem() { @@ -133,6 +140,7 @@ public TypeHolderExample integerItem(Integer integerItem) { * Get integerItem * @return integerItem **/ + @NotNull @ApiModelProperty(example = "-2", required = true, value = "") public Integer getIntegerItem() { @@ -155,6 +163,7 @@ public TypeHolderExample boolItem(Boolean boolItem) { * Get boolItem * @return boolItem **/ + @NotNull @ApiModelProperty(example = "true", required = true, value = "") public Boolean isBoolItem() { @@ -182,6 +191,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { * Get arrayItem * @return arrayItem **/ + @NotNull @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "") public List getArrayItem() { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java index d91115317819..760ff3053791 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java @@ -23,6 +23,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.IOException; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * User diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java index 44f00ecc1bd0..d1bae238ba51 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java @@ -26,6 +26,9 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import javax.validation.constraints.*; +import javax.validation.Valid; +import org.hibernate.validator.constraints.*; /** * XmlItem @@ -183,6 +186,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) { * @return attributeNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getAttributeNumber() { @@ -306,6 +310,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) { * @return nameNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNameNumber() { @@ -460,6 +465,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) { * @return prefixNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNumber() { @@ -614,6 +620,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) { * @return namespaceNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getNamespaceNumber() { @@ -768,6 +775,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { * @return prefixNsNumber **/ @javax.annotation.Nullable + @Valid @ApiModelProperty(example = "1.234", value = "") public BigDecimal getPrefixNsNumber() {