diff --git a/modules/openapi-generator/src/main/resources/Java/BeanValidationException.mustache b/modules/openapi-generator/src/main/resources/Java/BeanValidationException.mustache index d8b0fa695c61..d551902f8184 100644 --- a/modules/openapi-generator/src/main/resources/Java/BeanValidationException.mustache +++ b/modules/openapi-generator/src/main/resources/Java/BeanValidationException.mustache @@ -4,8 +4,8 @@ package {{invokerPackage}}; import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ValidationException; +import {{javaxPackage}}.validation.ConstraintViolation; +import {{javaxPackage}}.validation.ValidationException; public class BeanValidationException extends ValidationException { /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache index 27b45641782d..eecc6da74b20 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache @@ -24,8 +24,8 @@ import java.util.Map; import java.util.StringJoiner; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{>generatedAnnotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache index b4393ea82f6d..05b2bf9fd92a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache index 74a70a3ea5dc..3a506ca3f828 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache @@ -358,13 +358,12 @@ {{/openApiNullable}} {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 5.10.2 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache index af05d6595fb9..3d34681ea3f6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import feign.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api_test.mustache index 1db841158dcb..62521123f619 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/api_test.mustache @@ -14,8 +14,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/model.mustache index 5fa9bca806e3..108748f607e3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/model.mustache @@ -59,8 +59,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index 9be4a094faf9..79712da6a4e7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -403,13 +403,12 @@ {{/openApiNullable}} {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 5.10.0 1.0.0 8.3.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache index 8d3e62f27733..4fcc047a5b2d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache @@ -12,8 +12,8 @@ import {{javaxPackage}}.ws.rs.core.GenericType; {{/imports}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import java.util.ArrayList; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache index 7b8214bd48ad..926ba0a82913 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache index 1904ee40ea4f..2758278aceed 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache @@ -42,8 +42,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 214d3ce2b6a8..ec3ad12d3285 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -401,13 +401,12 @@ 0.2.6 {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 5.10.0 {{#hasHttpSignatureMethods}} 1.8 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache index d2f13457c606..49583229d488 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache @@ -400,9 +400,7 @@ 2.17.1 0.2.6 2.1.1 - {{#useBeanValidation}} 3.0.2 - {{/useBeanValidation}} 5.10.0 {{#hasHttpSignatureMethods}} 1.8 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache index a80dcbac8d6d..0ade8e9c2bae 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache @@ -14,8 +14,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#hasFormParamsInSpec}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache index 497bd5308d4f..8558cc6f449e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api_test.mustache @@ -19,8 +19,8 @@ import java.util.concurrent.CompletableFuture; {{/asyncNative}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache index cd2a85a22269..b3beca8d3273 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache @@ -47,8 +47,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache index 8ed827791d18..62bb7917deb1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache @@ -295,13 +295,12 @@ 0.2.6 {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} {{#hasFormParamsInSpec}} 4.5.14 {{/hasFormParamsInSpec}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache index 96757ed648b9..ab2f93c77d3b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache @@ -26,14 +26,14 @@ import io.swagger.v3.oas.models.parameters.Parameter; import java.io.IOException; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.ValidatorFactory; -import jakarta.validation.executable.ExecutableValidator; +import {{javaxPackage}}.validation.ConstraintViolation; +import {{javaxPackage}}.validation.Validation; +import {{javaxPackage}}.validation.ValidatorFactory; +import {{javaxPackage}}.validation.executable.ExecutableValidator; import java.util.Set; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache index 29f682678b58..b56bdf4db09b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache @@ -17,8 +17,8 @@ import java.io.InputStream; {{/supportStreaming}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache index c82b0fbe2ace..3a1cca8d7d4f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache @@ -21,8 +21,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index def53f2fc2ad..465076a4d6ea 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -423,16 +423,15 @@ {{/joda}} {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} {{#performBeanValidation}} 3.0.3 {{/performBeanValidation}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 5.10.3 1.10.0 2.1.6 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache index 5ae6e5057b07..8ccff676f1ae 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache @@ -33,8 +33,8 @@ import io.swagger.v3.oas.annotations.security.*; {{/swagger2AnnotationLibrary}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import java.lang.reflect.Type; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache index d7d9dae2bffb..adcbd80856df 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache @@ -20,8 +20,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; 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 396dd69c20bb..1655d52c21ef 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 @@ -358,13 +358,12 @@ {{/jackson}} {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 3.6.0 5.10.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache index 1475fc0f4ec9..410edc27f81b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache @@ -11,6 +11,11 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; + +{{/useBeanValidation}} import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api_test.mustache index dc34083413e0..e54a4ccc23a6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/api_test.mustache @@ -4,8 +4,8 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -13,10 +13,15 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; + +{{/useBeanValidation}} /** * API tests for {{classname}} */ -@Ignore +@Disabled public class {{classname}}Test { private final {{classname}} api = new {{classname}}(); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache index d3f6ab6500e1..5ed5aaeef2a3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache @@ -362,9 +362,7 @@ {{#joda}} 2.9.9 {{/joda}} - {{#useBeanValidation}} 3.0.2 - {{/useBeanValidation}} {{#performBeanValidation}} 5.4.3.Final {{/performBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache index aa1a98fd3d88..6cf513730b38 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache @@ -14,8 +14,8 @@ import java.util.Map; import java.util.stream.Collectors; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache index 04a19f1f173c..e1a213c02bac 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index a900fc8065d8..6f6068e0df40 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -123,10 +123,12 @@ ext { {{#useJakartaEe}} spring_web_version = "6.1.5" jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" {{/useJakartaEe}} {{^useJakartaEe}} spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" {{/useJakartaEe}} jodatime_version = "2.9.9" junit_version = "5.10.2" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 250417d7870f..8640419c68b5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -367,29 +367,24 @@ {{#swagger2AnnotationLibrary}} 2.2.15 {{/swagger2AnnotationLibrary}} - {{#useJakartaEe}} - 6.1.5 - {{/useJakartaEe}} - {{^useJakartaEe}} - 5.3.33 - {{/useJakartaEe}} 2.17.1 2.17.1 {{#openApiNullable}} 0.2.6 {{/openApiNullable}} {{#useJakartaEe}} + 6.1.5 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} + 5.3.33 1.3.5 + 2.0.2 {{/useJakartaEe}} {{#joda}} 2.9.9 {{/joda}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} {{#performBeanValidation}} 5.4.3.Final {{/performBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache index dd521a5fc87f..0b01055151b0 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache @@ -35,8 +35,8 @@ import java.util.Map; import java.util.Set; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#operations}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache index dab62f328cb0..b84e6b1735dd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache @@ -15,8 +15,8 @@ import java.util.List; import java.util.Map; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache index e78bd985abf8..7f7b9e2b0f2b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache @@ -18,8 +18,8 @@ import okhttp3.MultipartBody; {{/imports}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import java.util.ArrayList; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index b02a5fb2e556..7f5d6b892029 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -405,13 +405,12 @@ {{/joda}} {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} - {{#useBeanValidation}} - 3.0.2 - {{/useBeanValidation}} 1.0.1 5.10.3 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache index 65600dbfcd0e..b71837f55c4e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache @@ -12,8 +12,8 @@ import java.util.Map; import java.util.stream.Collectors; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache index c5d568617fc6..e0a960d12bb8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache @@ -15,8 +15,8 @@ import java.util.Map; import java.util.stream.Collectors; {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index 597411638537..be194ab23c4c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -133,12 +133,14 @@ ext { {{#useJakartaEe}} spring_boot_version = "3.0.12" jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" reactor_version = "3.5.12" reactor_netty_version = "1.1.13" {{/useJakartaEe}} {{^useJakartaEe}} spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" reactor_version = "3.4.34" reactor_netty_version = "1.0.39" {{/useJakartaEe}} diff --git a/modules/openapi-generator/src/main/resources/Java/model.mustache b/modules/openapi-generator/src/main/resources/Java/model.mustache index b50416793721..55e6678d2f05 100644 --- a/modules/openapi-generator/src/main/resources/Java/model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/model.mustache @@ -49,8 +49,8 @@ import android.os.Parcelable; import android.os.Parcel; {{/parcelableModel}} {{#useBeanValidation}} -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import {{javaxPackage}}.validation.constraints.*; +import {{javaxPackage}}.validation.Valid; {{/useBeanValidation}} {{#performBeanValidation}} import org.hibernate.validator.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index b733ab9bb617..b2bc5a25d8a6 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -368,13 +368,12 @@ 2.17.1 {{#useJakartaEe}} 2.1.1 + 3.0.2 {{/useJakartaEe}} {{^useJakartaEe}} 1.3.5 + 2.0.2 {{/useJakartaEe}} -{{#useBeanValidation}} - 3.0.2 -{{/useBeanValidation}} 1.0.0 5.10.2 1.10.0 diff --git a/samples/client/echo_api/java/apache-httpclient/pom.xml b/samples/client/echo_api/java/apache-httpclient/pom.xml index 9fae75dcad15..aac97d30164a 100644 --- a/samples/client/echo_api/java/apache-httpclient/pom.xml +++ b/samples/client/echo_api/java/apache-httpclient/pom.xml @@ -274,6 +274,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.2 diff --git a/samples/client/echo_api/java/feign-gson/pom.xml b/samples/client/echo_api/java/feign-gson/pom.xml index f0ea88c5bd63..7ad9e981a577 100644 --- a/samples/client/echo_api/java/feign-gson/pom.xml +++ b/samples/client/echo_api/java/feign-gson/pom.xml @@ -305,6 +305,7 @@ 2.10.1 0.2.6 1.3.5 + 2.0.2 5.10.0 1.0.0 8.3.3 diff --git a/samples/client/echo_api/java/native/pom.xml b/samples/client/echo_api/java/native/pom.xml index 4a6b30f6d0e3..56a253b74477 100644 --- a/samples/client/echo_api/java/native/pom.xml +++ b/samples/client/echo_api/java/native/pom.xml @@ -256,6 +256,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 4.5.14 5.10.2 2.27.2 diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml index c8559aa93a36..7a5b714d3160 100644 --- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml +++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml @@ -334,6 +334,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/echo_api/java/okhttp-gson/pom.xml b/samples/client/echo_api/java/okhttp-gson/pom.xml index b7a41cebfbb6..862d43891b8e 100644 --- a/samples/client/echo_api/java/okhttp-gson/pom.xml +++ b/samples/client/echo_api/java/okhttp-gson/pom.xml @@ -329,6 +329,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/echo_api/java/restclient/pom.xml b/samples/client/echo_api/java/restclient/pom.xml index 0386d9f1470c..b61ae8db3f4a 100644 --- a/samples/client/echo_api/java/restclient/pom.xml +++ b/samples/client/echo_api/java/restclient/pom.xml @@ -285,6 +285,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/AuthApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/AuthApiTest.java index e258cc91dbd1..3d8b19258ce0 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/AuthApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/AuthApiTest.java @@ -13,50 +13,46 @@ package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * API tests for AuthApi */ +@Disabled public class AuthApiTest { private final AuthApi api = new AuthApi(); + /** * To test HTTP basic authentication * - *

To test HTTP basic authentication + * To test HTTP basic authentication */ @Test - public void testAuthHttpBasicTest() { - // given - api.getApiClient().setUsername("test_user"); - api.getApiClient().setPassword("test_password"); - - // when + public void testAuthHttpBasicTest() { String response = api.testAuthHttpBasic(); - assertThat( - response, - containsString("Authorization: Basic dGVzdF91c2VyOnRlc3RfcGFzc3dvcmQ=")); + // TODO: test validations } - + /** * To test HTTP bearer authentication * - *

To test HTTP bearer authentication + * To test HTTP bearer authentication */ @Test - public void testAuthHttpBearerTest() { - // given - api.getApiClient().setBearerToken("test_token"); - - // when + public void testAuthHttpBearerTest() { String response = api.testAuthHttpBearer(); - assertThat(response, containsString("Authorization: Bearer test_token")); + // TODO: test validations } + } \ No newline at end of file diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/BodyApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/BodyApiTest.java index 42145cd9d3b2..4c26e9950381 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/BodyApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/BodyApiTest.java @@ -10,278 +10,158 @@ * Do not edit the class manually. */ -package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; +package org.openapitools.client.api; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.junit.Test; -import org.openapitools.client.ApiClient; -import org.openapitools.client.GifHttpMessageConverter; -import org.openapitools.client.OctetStreamHttpMessageConverter; -import org.openapitools.client.model.Category; import org.openapitools.client.model.Pet; -import org.openapitools.client.model.Pet.StatusEnum; import org.openapitools.client.model.StringEnumRef; import org.openapitools.client.model.Tag; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -/** API tests for BodyApi */ -public class BodyApiTest { - - private final BodyApi api = new BodyApi(); - - /** - * Test binary (gif) response body - * - *

Test binary (gif) response body - */ - @Test - public void testBinaryGifTest() throws IOException { - // given - var restClient = - ApiClient.buildRestClientBuilder() - .messageConverters(converters -> converters.add(new GifHttpMessageConverter())) - .build(); - api.setApiClient(new ApiClient(restClient)); - - // when - File response = api.testBinaryGif(); - - // then - assertThat(response, notNullValue()); - assertThat(response.exists(), is(true)); - assertThat(Files.probeContentType(response.toPath()), is("image/gif")); - } - - /** - * Test body parameter(s) - * - *

Test body parameter(s) - */ - @Test - public void testBodyApplicationOctetstreamBinaryTest() throws IOException { - // given - var restClient = - ApiClient.buildRestClientBuilder() - .messageConverters(converters -> converters.add(new OctetStreamHttpMessageConverter())) - .build(); - api.setApiClient(new ApiClient(restClient)); - - var tempFile = Files.createTempFile("test", ".txt"); - Files.writeString(tempFile, "test123"); - - File body = tempFile.toFile(); - - // when - String response = api.testBodyApplicationOctetstreamBinary(body); - - // then - assertThat(response, containsString("Content-Type: application/octet-stream")); - assertThat(response, containsString("test123")); - } - - /** - * Test array of binary in multipart mime - * - *

Test array of binary in multipart mime - */ - @Test - public void testBodyMultipartFormdataArrayOfBinaryTest() throws IOException { - // given - var firstFile = Files.createTempFile("test", ".txt"); - String firstFileContent = "Thanks for using OpenAPI generator :)"; - Files.writeString(firstFile, firstFileContent); - - var secondFile = Files.createTempFile("test2", ".txt"); - String secondFileContent = "Your ad could be here"; - Files.writeString(secondFile, secondFileContent); - - List files = List.of(firstFile.toFile(), secondFile.toFile()); - - // when - String response = api.testBodyMultipartFormdataArrayOfBinary(files); - - // then - assertThat(response, containsString("Content-Type: multipart/form-data")); - assertThat(response, containsString(firstFileContent)); - assertThat(response, containsString(secondFileContent)); - } - - /** - * Test single binary in multipart mime - * - *

Test single binary in multipart mime - */ - @Test - public void testBodyMultipartFormdataSingleBinaryTest() throws IOException { - // given - var testFile = Files.createTempFile("test", ".txt"); - String testFileContent = "Lorem ipsum dolor sit amet"; - Files.writeString(testFile, testFileContent); - - // when - String response = api.testBodyMultipartFormdataSingleBinary(testFile.toFile()); - - // then - assertThat(response, containsString("Content-Type: multipart/form-data")); - assertThat(response, containsString(testFileContent)); - } - - /** - * Test body parameter(s) - * - *

Test body parameter(s) - */ - @Test - public void testEchoBodyAllOfPetTest() { - // given - // The content length must be set to disable the Transfer-Encoding: chunked which would lead to - // unparsable response because the echo server is replying them as body. - api.getApiClient().addDefaultHeader("Content-Length", "192"); - - Pet pet = - new Pet() - .id(42L) - .name("Corgi") - .category(new Category().id(1L).name("Dogs")) - .status(StatusEnum.SOLD) - .addPhotoUrlsItem( - "https://cdn.pixabay.com/photo/2021/10/13/09/01/corgi-6705821_1280.jpg") - .addTagsItem(new Tag().id(1L).name("cute")); - - // when - Pet response = api.testEchoBodyAllOfPet(pet); - - // then - assertThat(response, is(pet)); - } - - /** - * Test free form object - * - *

Test free form object - */ - @Test - public void testEchoBodyFreeFormObjectResponseStringTest() { - // given - // The content length must be set to disable the Transfer-Encoding: chunked which would lead to - // unparsable response because the echo server is replying them as body. - api.getApiClient().addDefaultHeader("Content-Length", "51"); - - Object mapAsObject = - new HashMap<>( - Map.of( - "firstKey", "firstValue", - "secondKey", "secondValue")); - - // when - String response = api.testEchoBodyFreeFormObjectResponseString(mapAsObject); - - // then - assertThat(response, is("{\"firstKey\":\"firstValue\",\"secondKey\":\"secondValue\"}")); - } - - /** - * Test body parameter(s) - * - *

Test body parameter(s) - */ - @Test - public void testEchoBodyPetTest() { - // given - // The content length must be set to disable the Transfer-Encoding: chunked which would lead to - // unparsable response because the echo server is replying them as body. - api.getApiClient().addDefaultHeader("Content-Length", "192"); - - Pet pet = - new Pet() - .id(42L) - .name("Corgi") - .category(new Category().id(1L).name("Dogs")) - .status(StatusEnum.SOLD) - .addPhotoUrlsItem( - "https://cdn.pixabay.com/photo/2021/10/13/09/01/corgi-6705821_1280.jpg") - .addTagsItem(new Tag().id(1L).name("cute")); - - // when - Pet response = api.testEchoBodyPet(pet); - - // then - assertThat(response, is(pet)); - } - - /** - * Test empty response body - * - *

Test empty response body - */ - @Test - public void testEchoBodyPetResponseStringTest() { - // given - // The content length must be set to disable the Transfer-Encoding: chunked which would lead to - // unparsable response because the echo server is replying them as body. - api.getApiClient().addDefaultHeader("Content-Length", "192"); - - Pet pet = - new Pet() - .id(42L) - .name("Corgi") - .category(new Category().id(1L).name("Dogs")) - .status(StatusEnum.SOLD) - .addPhotoUrlsItem( - "https://cdn.pixabay.com/photo/2021/10/13/09/01/corgi-6705821_1280.jpg") - .addTagsItem(new Tag().id(1L).name("cute")); - - // when - String response = api.testEchoBodyPetResponseString(pet); - - // then - assertThat( - response, - is( - "{\"id\":42,\"name\":\"Corgi\",\"category\":{\"id\":1,\"name\":\"Dogs\"},\"photoUrls\":[\"https://cdn.pixabay.com/photo/2021/10/13/09/01/corgi-6705821_1280.jpg\"],\"tags\":[{\"id\":1,\"name\":\"cute\"}],\"status\":\"sold\"}")); - } - - /** - * Test string enum response body - * - *

Test string enum response body - */ - @Test - public void testEchoBodyStringEnumTest() { - // given - String body = "\"failure\""; - - // when - StringEnumRef response = api.testEchoBodyStringEnum(body); - - // then - assertThat(response, is(StringEnumRef.FAILURE)); - } - - /** - * Test empty json (request body) - * - *

Test empty json (request body) - */ - @Test - public void testEchoBodyTagResponseStringTest() { - // given - Tag tag = null; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; - // when - String response = api.testEchoBodyTagResponseString(tag); +/** + * API tests for BodyApi + */ +@Disabled +public class BodyApiTest { - // then - assertThat(response, nullValue()); - } -} + private final BodyApi api = new BodyApi(); + + + /** + * Test binary (gif) response body + * + * Test binary (gif) response body + */ + @Test + public void testBinaryGifTest() { + File response = api.testBinaryGif(); + + // TODO: test validations + } + + /** + * Test body parameter(s) + * + * Test body parameter(s) + */ + @Test + public void testBodyApplicationOctetstreamBinaryTest() { + File body = null; + String response = api.testBodyApplicationOctetstreamBinary(body); + + // TODO: test validations + } + + /** + * Test array of binary in multipart mime + * + * Test array of binary in multipart mime + */ + @Test + public void testBodyMultipartFormdataArrayOfBinaryTest() { + List files = null; + String response = api.testBodyMultipartFormdataArrayOfBinary(files); + + // TODO: test validations + } + + /** + * Test single binary in multipart mime + * + * Test single binary in multipart mime + */ + @Test + public void testBodyMultipartFormdataSingleBinaryTest() { + File myFile = null; + String response = api.testBodyMultipartFormdataSingleBinary(myFile); + + // TODO: test validations + } + + /** + * Test body parameter(s) + * + * Test body parameter(s) + */ + @Test + public void testEchoBodyAllOfPetTest() { + Pet pet = null; + Pet response = api.testEchoBodyAllOfPet(pet); + + // TODO: test validations + } + + /** + * Test free form object + * + * Test free form object + */ + @Test + public void testEchoBodyFreeFormObjectResponseStringTest() { + Object body = null; + String response = api.testEchoBodyFreeFormObjectResponseString(body); + + // TODO: test validations + } + + /** + * Test body parameter(s) + * + * Test body parameter(s) + */ + @Test + public void testEchoBodyPetTest() { + Pet pet = null; + Pet response = api.testEchoBodyPet(pet); + + // TODO: test validations + } + + /** + * Test empty response body + * + * Test empty response body + */ + @Test + public void testEchoBodyPetResponseStringTest() { + Pet pet = null; + String response = api.testEchoBodyPetResponseString(pet); + + // TODO: test validations + } + + /** + * Test string enum response body + * + * Test string enum response body + */ + @Test + public void testEchoBodyStringEnumTest() { + String body = null; + StringEnumRef response = api.testEchoBodyStringEnum(body); + + // TODO: test validations + } + + /** + * Test empty json (request body) + * + * Test empty json (request body) + */ + @Test + public void testEchoBodyTagResponseStringTest() { + Tag tag = null; + String response = api.testEchoBodyTagResponseString(tag); + + // TODO: test validations + } + +} \ No newline at end of file diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/FormApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/FormApiTest.java index 140bca8e3dea..48a2f1342590 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/FormApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/FormApiTest.java @@ -10,154 +10,72 @@ * Do not edit the class manually. */ -package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +package org.openapitools.client.api; -import org.junit.Test; import org.openapitools.client.model.TestFormObjectMultipartRequestMarker; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -/** API tests for FormApi */ -public class FormApiTest { - - private final FormApi api = new FormApi(); - - /** - * Test form parameter(s) - * - *

Test form parameter(s) - */ - @Test - public void testFormIntegerBooleanStringTest() { - // Given - // The content length must be set to disable the Transfer-Encoding: chunked which would lead to - // unparsable response because the echo server is replying them as body. - api.getApiClient().addDefaultHeader("Content-Length", "53"); - - Integer integerForm = 42; - Boolean booleanForm = true; - String stringForm = "Test123"; - - // When - String response = api.testFormIntegerBooleanString(integerForm, booleanForm, stringForm); - - // Then - assertThat(response, containsString("integer_form=42&boolean_form=true&string_form=Test123")); - } - - /** - * Test form parameter(s) for multipart schema - * - *

Test form parameter(s) for multipart schema - */ - @Test - public void testFormObjectMultipartTest() { - // Given - TestFormObjectMultipartRequestMarker marker = - new TestFormObjectMultipartRequestMarker().name("Test Marker"); - - // When - String response = api.testFormObjectMultipart(marker); - - // Then - assertThat(response, containsString("{\"name\":\"Test Marker\"}")); - } - - /** - * Test form parameter(s) for oneOf schema with only the first parameters filled - * - *

Test form parameter(s) for oneOf schema - */ - @Test - public void testFormOneofTest_first() { - // Given - String form1 = "test12"; - Integer form2 = 12; - - String form3 = null; - Boolean form4 = null; - - Long id = null; - String name = null; - - // When - String response = api.testFormOneof(form1, form2, form3, form4, id, name); - - // Then - assertThat(response, containsString("form1=test12&form2=12")); - } +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; - /** - * Test form parameter(s) for oneOf schema with only the second parameters filled - * - *

Test form parameter(s) for oneOf schema - */ - @Test - public void testFormOneofTest_second() { - // Given - String form1 = null; - Integer form2 = null; - - String form3 = "34test"; - Boolean form4 = false; - - Long id = null; - String name = null; - - // When - String response = api.testFormOneof(form1, form2, form3, form4, id, name); - - // Then - assertThat(response, containsString("form3=34test&form4=false")); - } - - /** - * Test form parameter(s) for oneOf schema with only the third parameters filled - * - *

Test form parameter(s) for oneOf schema - */ - @Test - public void testFormOneofTest_third() { - // Given - String form1 = null; - Integer form2 = null; - - String form3 = null; - Boolean form4 = null; - - Long id = 21L; - String name = "Hans"; - - // When - String response = api.testFormOneof(form1, form2, form3, form4, id, name); - - // Then - assertThat(response, containsString("id=21&name=Hans")); - } - - /** - * Test form parameter(s) for oneOf schema with all parameters filled - * - *

Test form parameter(s) for oneOf schema - */ - @Test - public void testFormOneofTest_all() { - // Given - String form1 = "test12"; - Integer form2 = 12; - - String form3 = "34test"; - Boolean form4 = false; - - Long id = 21L; - String name = "Hans"; - - // When - String response = api.testFormOneof(form1, form2, form3, form4, id, name); +/** + * API tests for FormApi + */ +@Disabled +public class FormApiTest { - // Then - assertThat( - response, containsString("form1=test12&form2=12&form3=34test&form4=false&id=21&name=Hans")); - } -} + private final FormApi api = new FormApi(); + + + /** + * Test form parameter(s) + * + * Test form parameter(s) + */ + @Test + public void testFormIntegerBooleanStringTest() { + Integer integerForm = null; + Boolean booleanForm = null; + String stringForm = null; + String response = api.testFormIntegerBooleanString(integerForm, booleanForm, stringForm); + + // TODO: test validations + } + + /** + * Test form parameter(s) for multipart schema + * + * Test form parameter(s) for multipart schema + */ + @Test + public void testFormObjectMultipartTest() { + TestFormObjectMultipartRequestMarker marker = null; + String response = api.testFormObjectMultipart(marker); + + // TODO: test validations + } + + /** + * Test form parameter(s) for oneOf schema + * + * Test form parameter(s) for oneOf schema + */ + @Test + public void testFormOneofTest() { + String form1 = null; + Integer form2 = null; + String form3 = null; + Boolean form4 = null; + Long id = null; + String name = null; + String response = api.testFormOneof(form1, form2, form3, form4, id, name); + + // TODO: test validations + } + +} \ No newline at end of file diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java index c0230e6b003d..a8f1764c216f 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/HeaderApiTest.java @@ -10,51 +10,43 @@ * Do not edit the class manually. */ -package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +package org.openapitools.client.api; -import org.junit.Test; import org.openapitools.client.model.StringEnumRef; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -/** API tests for HeaderApi */ +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for HeaderApi + */ +@Disabled public class HeaderApiTest { - private final HeaderApi api = new HeaderApi(); - - /** - * Test header parameter(s) - * - *

Test header parameter(s) - */ - @Test - public void testHeaderIntegerBooleanStringEnumsTest() { - // Given - Integer integerHeader = 11; - Boolean booleanHeader = true; - String stringHeader = "simple String Header"; - String enumNonrefStringHeader = "false"; - StringEnumRef enumRefStringHeader = StringEnumRef.UNCLASSIFIED; - - // When - String response = - api.testHeaderIntegerBooleanStringEnums( - integerHeader, - booleanHeader, - stringHeader, - enumNonrefStringHeader, - enumRefStringHeader); - - // Then - assertThat( - response, - allOf( - containsString("integer_header: 11"), - containsString("boolean_header: true"), - containsString("string_header: simple String Header"), - containsString("enum_nonref_string_header: false"), - containsString("enum_ref_string_header: unclassified"))); - } -} + private final HeaderApi api = new HeaderApi(); + + + /** + * Test header parameter(s) + * + * Test header parameter(s) + */ + @Test + public void testHeaderIntegerBooleanStringEnumsTest() { + Integer integerHeader = null; + Boolean booleanHeader = null; + String stringHeader = null; + String enumNonrefStringHeader = null; + StringEnumRef enumRefStringHeader = null; + String response = api.testHeaderIntegerBooleanStringEnums(integerHeader, booleanHeader, stringHeader, enumNonrefStringHeader, enumRefStringHeader); + + // TODO: test validations + } + +} \ No newline at end of file diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/PathApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/PathApiTest.java index d9381c9c2f3e..9605fe30aeb6 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/PathApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/PathApiTest.java @@ -10,40 +10,42 @@ * Do not edit the class manually. */ -package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +package org.openapitools.client.api; -import org.junit.Test; import org.openapitools.client.model.StringEnumRef; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -/** API tests for PathApi */ +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for PathApi + */ +@Disabled public class PathApiTest { - private final PathApi api = new PathApi(); - - /** - * Test path parameter(s) - * - *

Test path parameter(s) - */ - @Test - public void - testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest() { - // Given - String pathString = "simple String Path"; - Integer pathInteger = 50; - String enumNonrefStringPath = "true"; - StringEnumRef enumRefStringPath = StringEnumRef.SUCCESS; - - // When - String response = - api.testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath( - pathString, pathInteger, enumNonrefStringPath, enumRefStringPath); - - // Then - assertThat( - response, containsString("/path/string/simple%20String%20Path/integer/50/true/success")); - } -} + private final PathApi api = new PathApi(); + + + /** + * Test path parameter(s) + * + * Test path parameter(s) + */ + @Test + public void testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest() { + String pathString = null; + Integer pathInteger = null; + String enumNonrefStringPath = null; + StringEnumRef enumRefStringPath = null; + String response = api.testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(pathString, pathInteger, enumNonrefStringPath, enumRefStringPath); + + // TODO: test validations + } + +} \ No newline at end of file diff --git a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/QueryApiTest.java b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/QueryApiTest.java index 827ef91367e0..d105e6f1fa20 100644 --- a/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/QueryApiTest.java +++ b/samples/client/echo_api/java/restclient/src/test/java/org/openapitools/client/api/QueryApiTest.java @@ -10,206 +10,167 @@ * Do not edit the class manually. */ -package org.openapitools.client.api; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +package org.openapitools.client.api; -import java.time.Instant; -import java.time.LocalDate; -import java.util.List; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; import org.openapitools.client.model.DataQuery; +import java.time.LocalDate; +import java.time.Instant; import org.openapitools.client.model.Pet; import org.openapitools.client.model.StringEnumRef; import org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter; import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -/** API tests for QueryApi */ +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for QueryApi + */ +@Disabled public class QueryApiTest { - private final QueryApi api = new QueryApi(); - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - public void testEnumRefStringTest() { - // Given - String enumNonrefStringQuery = "false"; - StringEnumRef enumRefStringQuery = StringEnumRef.SUCCESS; - - // When - String response = api.testEnumRefString(enumNonrefStringQuery, enumRefStringQuery); - - // Then - assertThat( - response, containsString("?enum_nonref_string_query=false&enum_ref_string_query=success")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - public void testQueryDatetimeDateStringTest() { - // Given - Instant datetimeQuery = Instant.ofEpochMilli(1720361075); - LocalDate dateQuery = LocalDate.of(2024, 7, 7); - String stringQuery = "2024-07-07T16:05:59Z"; - - // When - String response = api.testQueryDatetimeDateString(datetimeQuery, dateQuery, stringQuery); - - // Then - assertThat( - response, - containsString( - "?datetime_query=1970-01-20T21%3A52%3A41.075Z&date_query=2024-07-07&string_query=2024-07-07T16%3A05%3A59Z")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - public void testQueryIntegerBooleanStringTest() { - // Given - Integer integerQuery = 42; - Boolean booleanQuery = false; - String stringQuery = "Hello World!"; - - // When - String response = api.testQueryIntegerBooleanString(integerQuery, booleanQuery, stringQuery); - - // Then - assertThat( - response, - containsString("?integer_query=42&boolean_query=false&string_query=Hello%20World%21")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - @Disabled("The deep object style and the whole dynamic operations are currently not supported") - public void testQueryStyleDeepObjectExplodeTrueObjectTest() { - Pet queryObject = null; - String response = api.testQueryStyleDeepObjectExplodeTrueObject(queryObject); - - // Like Spring WebClient and RestTemplate, the deep object style is currently not - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - @Disabled("The deep object style and the whole dynamic operations are currently not supported") - public void testQueryStyleDeepObjectExplodeTrueObjectAllOfTest() { - TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject = null; - String response = api.testQueryStyleDeepObjectExplodeTrueObjectAllOf(queryObject); - - // Like Spring WebClient and RestTemplate, the deep object style and the whole dynamic - // operations are currently not supported - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - public void testQueryStyleFormExplodeFalseArrayIntegerTest() { - // Given - List queryObject = List.of(1, 6, 2, 5, 3, 4); - - // When - String response = api.testQueryStyleFormExplodeFalseArrayInteger(queryObject); - - // Then - assertThat(response, containsString("?query_object=1%2C6%2C2%2C5%2C3%2C4")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - public void testQueryStyleFormExplodeFalseArrayStringTest() { - // Given - List queryObject = List.of("Hello", "World"); - - // When - String response = api.testQueryStyleFormExplodeFalseArrayString(queryObject); - - // Then - assertThat(response, containsString("?query_object=Hello%2CWorld")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - @Disabled("The deep object style and the whole dynamic operations are currently not supported") - public void testQueryStyleFormExplodeTrueArrayStringTest() { - // Given - TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject = - new TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() - .addValuesItem("Hello") - .addValuesItem("Hallo") - .addValuesItem("Bonjour"); - - // When - String response = api.testQueryStyleFormExplodeTrueArrayString(queryObject); - - // Then - // Like Spring WebClient and RestTemplate, the deep object style and the whole dynamic - // operations are currently not supported - assertThat( - response, containsString("?query_object=Hello&query_object=Hallo&query_object=Bonjour")); - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - @Disabled("The deep object style and the whole dynamic operations are currently not supported") - public void testQueryStyleFormExplodeTrueObjectTest() { - Pet queryObject = null; - String response = api.testQueryStyleFormExplodeTrueObject(queryObject); - - // TODO: test validations - // Like Spring WebClient and RestTemplate, the deep object style and the whole dynamic - // operations are currently not supported - } - - /** - * Test query parameter(s) - * - *

Test query parameter(s) - */ - @Test - @Disabled("The deep object style and the whole dynamic operations are currently not supported") - public void testQueryStyleFormExplodeTrueObjectAllOfTest() { - DataQuery queryObject = null; - String response = api.testQueryStyleFormExplodeTrueObjectAllOf(queryObject); - - // TODO: test validations - // Like Spring WebClient and RestTemplate, the deep object style and the whole dynamic - // operations are currently not supported - } -} + private final QueryApi api = new QueryApi(); + + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testEnumRefStringTest() { + String enumNonrefStringQuery = null; + StringEnumRef enumRefStringQuery = null; + String response = api.testEnumRefString(enumNonrefStringQuery, enumRefStringQuery); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryDatetimeDateStringTest() { + Instant datetimeQuery = null; + LocalDate dateQuery = null; + String stringQuery = null; + String response = api.testQueryDatetimeDateString(datetimeQuery, dateQuery, stringQuery); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryIntegerBooleanStringTest() { + Integer integerQuery = null; + Boolean booleanQuery = null; + String stringQuery = null; + String response = api.testQueryIntegerBooleanString(integerQuery, booleanQuery, stringQuery); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleDeepObjectExplodeTrueObjectTest() { + Pet queryObject = null; + String response = api.testQueryStyleDeepObjectExplodeTrueObject(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleDeepObjectExplodeTrueObjectAllOfTest() { + TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter queryObject = null; + String response = api.testQueryStyleDeepObjectExplodeTrueObjectAllOf(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleFormExplodeFalseArrayIntegerTest() { + List queryObject = null; + String response = api.testQueryStyleFormExplodeFalseArrayInteger(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleFormExplodeFalseArrayStringTest() { + List queryObject = null; + String response = api.testQueryStyleFormExplodeFalseArrayString(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleFormExplodeTrueArrayStringTest() { + TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject = null; + String response = api.testQueryStyleFormExplodeTrueArrayString(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleFormExplodeTrueObjectTest() { + Pet queryObject = null; + String response = api.testQueryStyleFormExplodeTrueObject(queryObject); + + // TODO: test validations + } + + /** + * Test query parameter(s) + * + * Test query parameter(s) + */ + @Test + public void testQueryStyleFormExplodeTrueObjectAllOfTest() { + DataQuery queryObject = null; + String response = api.testQueryStyleFormExplodeTrueObjectAllOf(queryObject); + + // TODO: test validations + } + +} \ No newline at end of file diff --git a/samples/client/echo_api/java/resttemplate/build.gradle b/samples/client/echo_api/java/resttemplate/build.gradle index 340d7586db50..9ab05db18345 100644 --- a/samples/client/echo_api/java/resttemplate/build.gradle +++ b/samples/client/echo_api/java/resttemplate/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/echo_api/java/resttemplate/pom.xml b/samples/client/echo_api/java/resttemplate/pom.xml index 5fb4a2a54413..f60f70b15e09 100644 --- a/samples/client/echo_api/java/resttemplate/pom.xml +++ b/samples/client/echo_api/java/resttemplate/pom.xml @@ -280,11 +280,12 @@ UTF-8 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/pom.xml b/samples/client/others/java/jersey2-oneOf-Mixed/pom.xml index cb6629fa41a9..e2b1323c705b 100644 --- a/samples/client/others/java/jersey2-oneOf-Mixed/pom.xml +++ b/samples/client/others/java/jersey2-oneOf-Mixed/pom.xml @@ -333,6 +333,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 2.21.0 diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/pom.xml b/samples/client/others/java/jersey2-oneOf-duplicates/pom.xml index cb6629fa41a9..e2b1323c705b 100644 --- a/samples/client/others/java/jersey2-oneOf-duplicates/pom.xml +++ b/samples/client/others/java/jersey2-oneOf-duplicates/pom.xml @@ -333,6 +333,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 2.21.0 diff --git a/samples/client/others/java/okhttp-gson-oneOf/pom.xml b/samples/client/others/java/okhttp-gson-oneOf/pom.xml index dd68d59ceee6..8d703337d94e 100644 --- a/samples/client/others/java/okhttp-gson-oneOf/pom.xml +++ b/samples/client/others/java/okhttp-gson-oneOf/pom.xml @@ -329,6 +329,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/others/java/okhttp-gson-streaming/pom.xml b/samples/client/others/java/okhttp-gson-streaming/pom.xml index 0904061dbb92..4b0f7510602c 100644 --- a/samples/client/others/java/okhttp-gson-streaming/pom.xml +++ b/samples/client/others/java/okhttp-gson-streaming/pom.xml @@ -329,6 +329,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml index 70570f31c895..ae545b66d114 100644 --- a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml +++ b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml @@ -285,6 +285,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/src/test/java/org/openapitools/client/api/ResourceApiTest.java b/samples/client/others/java/restclient-useAbstractionForFiles/src/test/java/org/openapitools/client/api/ResourceApiTest.java index fee02b33f146..a5d39415f7b8 100644 --- a/samples/client/others/java/restclient-useAbstractionForFiles/src/test/java/org/openapitools/client/api/ResourceApiTest.java +++ b/samples/client/others/java/restclient-useAbstractionForFiles/src/test/java/org/openapitools/client/api/ResourceApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import java.io.File; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for ResourceApi */ -@Ignore +@Disabled public class ResourceApiTest { private final ResourceApi api = new ResourceApi(); diff --git a/samples/client/others/java/resttemplate-list-schema-validation/build.gradle b/samples/client/others/java/resttemplate-list-schema-validation/build.gradle index 8ff1803614cb..95373be7574e 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/build.gradle +++ b/samples/client/others/java/resttemplate-list-schema-validation/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/others/java/resttemplate-list-schema-validation/pom.xml b/samples/client/others/java/resttemplate-list-schema-validation/pom.xml index 6775510dc3b9..2801e8f6b4be 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/pom.xml +++ b/samples/client/others/java/resttemplate-list-schema-validation/pom.xml @@ -287,12 +287,12 @@ UTF-8 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 - 3.0.2 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java index db27b67f8be8..3ebbaf3c23e9 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.stream.Collectors; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/samples/client/others/java/resttemplate-list-schema-validation/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/others/java/resttemplate-list-schema-validation/src/test/java/org/openapitools/client/api/UserApiTest.java index 3087a229dfa6..bb29dc9ec6f6 100644 --- a/samples/client/others/java/resttemplate-list-schema-validation/src/test/java/org/openapitools/client/api/UserApiTest.java +++ b/samples/client/others/java/resttemplate-list-schema-validation/src/test/java/org/openapitools/client/api/UserApiTest.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; /** * API tests for UserApi diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle index d3c5c07c66f2..b940117be525 100644 --- a/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle +++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml index 0399f1dfa6ac..a7c1f9713a20 100644 --- a/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml +++ b/samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml @@ -280,11 +280,12 @@ UTF-8 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle b/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle index f8ab8c7a41ff..5e9586e15476 100644 --- a/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle +++ b/samples/client/others/java/webclient-useAbstractionForFiles/build.gradle @@ -114,6 +114,7 @@ if(hasProperty('target') && target == 'android') { ext { spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" reactor_version = "3.4.34" reactor_netty_version = "1.0.39" jackson_version = "2.17.1" diff --git a/samples/client/petstore/java/apache-httpclient/pom.xml b/samples/client/petstore/java/apache-httpclient/pom.xml index 32d6030cd62b..874a8045299c 100644 --- a/samples/client/petstore/java/apache-httpclient/pom.xml +++ b/samples/client/petstore/java/apache-httpclient/pom.xml @@ -274,6 +274,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.2 diff --git a/samples/client/petstore/java/feign-no-nullable/pom.xml b/samples/client/petstore/java/feign-no-nullable/pom.xml index 1c2f5380e45f..1e12c67db067 100644 --- a/samples/client/petstore/java/feign-no-nullable/pom.xml +++ b/samples/client/petstore/java/feign-no-nullable/pom.xml @@ -316,6 +316,7 @@ 2.17.1 2.17.1 1.3.5 + 2.0.2 5.10.0 1.0.0 8.3.3 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 59ae4c527f68..9f4fc2fc3e7d 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -322,6 +322,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 1.0.0 8.3.3 diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml b/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml index 204486a27801..e8b2b4285933 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml @@ -338,6 +338,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 8.3.3 2.21.0 diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 1a2acde66f40..ada0fee29cda 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -338,6 +338,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 8.3.3 2.21.0 diff --git a/samples/client/petstore/java/native-async/pom.xml b/samples/client/petstore/java/native-async/pom.xml index 0b3180965b04..f5aa8987b095 100644 --- a/samples/client/petstore/java/native-async/pom.xml +++ b/samples/client/petstore/java/native-async/pom.xml @@ -256,6 +256,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 4.5.14 5.10.2 2.27.2 diff --git a/samples/client/petstore/java/native-jakarta/pom.xml b/samples/client/petstore/java/native-jakarta/pom.xml index ed0664542336..e327203f4e8d 100644 --- a/samples/client/petstore/java/native-jakarta/pom.xml +++ b/samples/client/petstore/java/native-jakarta/pom.xml @@ -256,6 +256,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 4.5.14 5.10.2 2.27.2 diff --git a/samples/client/petstore/java/native/pom.xml b/samples/client/petstore/java/native/pom.xml index 0b3180965b04..f5aa8987b095 100644 --- a/samples/client/petstore/java/native/pom.xml +++ b/samples/client/petstore/java/native/pom.xml @@ -256,6 +256,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 4.5.14 5.10.2 2.27.2 diff --git a/samples/client/petstore/java/okhttp-gson-3.1/pom.xml b/samples/client/petstore/java/okhttp-gson-3.1/pom.xml index cad8858e1326..f35785a5ecf9 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-3.1/pom.xml @@ -334,6 +334,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml b/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml index 4432d2ac1c6b..4d1adf440d55 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml @@ -339,6 +339,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml index c328e7c432d5..093370ee3238 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml @@ -339,6 +339,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml b/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml index aefb903304f2..ad5944f75711 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml @@ -334,6 +334,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml b/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml index c9f7368ef833..ea83c53acf89 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml @@ -334,6 +334,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 969ae65f70e1..8f24c134707b 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -341,6 +341,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml b/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml index c91c33c44b5c..e7d136d699ce 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-swagger1/pom.xml @@ -340,6 +340,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml b/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml index 969ea3012fd1..5cab5823b798 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-swagger2/pom.xml @@ -340,6 +340,7 @@ 3.14.0 0.2.6 1.3.5 + 2.0.2 5.10.3 1.10.0 2.1.6 diff --git a/samples/client/petstore/java/rest-assured-jackson/pom.xml b/samples/client/petstore/java/rest-assured-jackson/pom.xml index 9023c63de60d..6d5fc0164ac3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/pom.xml +++ b/samples/client/petstore/java/rest-assured-jackson/pom.xml @@ -284,7 +284,7 @@ 2.17.1 0.2.6 1.3.5 - 3.0.2 + 2.0.2 3.6.0 5.10.3 diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/BeanValidationException.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/BeanValidationException.java index 8a7c6ddac817..60bd8fc1b2eb 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/BeanValidationException.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/BeanValidationException.java @@ -15,8 +15,8 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ValidationException; +import javax.validation.ConstraintViolation; +import javax.validation.ValidationException; public class BeanValidationException extends ValidationException { /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 2685ba6a5ac9..4dfb005c9938 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -28,8 +28,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 0d263b24a10a..76fce0633b27 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,8 +35,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index c284c447580b..d00177e63313 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -27,8 +27,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java index c5afaeb43873..e703a9ec3098 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -30,8 +30,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java index 3fac8d0f7b6e..d34a720ff6a5 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java @@ -27,8 +27,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/UserApi.java index af049b9ec04c..2ad8b6a1da74 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/UserApi.java @@ -28,8 +28,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 12024a662fb3..91502a36eb2d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 0b9e798aec0c..6ccf57de3c3e 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java @@ -25,8 +25,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index ca4401c62f3d..78b1c5c189cb 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index fff494c2f6c4..1eb72c246336 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -26,8 +26,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index 4400e8bf3141..f5474af066ef 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index e1ed5a99cf50..cd8701cbef8a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java @@ -25,8 +25,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 9168b786d5b8..9848fd57ecd1 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index 3bd83d2e3d0e..7889c2118b02 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java index 1ba63042cc32..dd12637161ea 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java @@ -25,8 +25,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 503c3eb83551..96b83edb5803 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -26,8 +26,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index b57693d9dda9..5a93c24909aa 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -26,8 +26,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java index 801c3ab9d7ed..dfae0c843575 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -26,8 +26,8 @@ import org.openapitools.client.model.ReadOnlyFirst; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java index 5f03e452670c..8d1b6e7f3863 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java @@ -26,8 +26,8 @@ import org.openapitools.client.model.Cat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java index 28a0563a4b2a..28c847fa9b5f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java index 7d065e8ac702..2c923fcd6775 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java @@ -26,8 +26,8 @@ import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java index f525a4ae50e4..9383b3a6b753 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java index d365708344e8..f4f23a15486d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java index dba666b3bdf0..83fb08d4614e 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java index a26367c04731..1542b10b3f1d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java @@ -26,8 +26,8 @@ import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java index f96e0925399b..331482175a29 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -25,8 +25,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java index 9d1fa380058f..43ec2faf20c8 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java @@ -17,8 +17,8 @@ import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java index 7f4fc0e251fe..8f076161581f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -23,8 +23,8 @@ import org.openapitools.client.model.OuterEnum; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f2b452e954cc..0b5446ccb7b3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -26,8 +26,8 @@ import org.openapitools.client.model.ModelFile; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java index 09890117ffa5..151abf8cd60f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java @@ -27,8 +27,8 @@ import java.util.UUID; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index f9e10ed929ce..0bfee3a4c290 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java index 3a1c80489045..b66ea41f50f1 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java @@ -24,8 +24,8 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index a1c2435505e7..ed0dd1d9fc11 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -27,8 +27,8 @@ import org.openapitools.client.model.Animal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java index cff1ff20b6f4..b3d27c5b4e7d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java index fc5bf0a28967..3002301e8d8a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java index 69ff1e06f806..34648070ca7d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java index 2cd097dbc2ab..08c566893b3f 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java index a783a73fbba7..515a226c5067 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java index 8256dd0bd066..b03d5b83fbe2 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java index 030a1cd4eb4c..fcc627ee37ec 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -23,8 +23,8 @@ import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java index 25a95bc43040..1ddaad6851b5 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java @@ -23,8 +23,8 @@ import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java index 74b3ce6f22d4..d05359b9a657 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -23,8 +23,8 @@ import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java index efff50487a8d..386290bc6528 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -17,8 +17,8 @@ import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java index 465fc3e327de..2edc2d4c6eb2 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java @@ -30,8 +30,8 @@ import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index de25b47fb0d8..6554a493d1b0 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java index 7fddd1a7b291..14b51886e0f6 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java index 246f9096b5c9..6ff5b5bd86bd 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 59229a57553d..ee0aa7ac4fa7 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -26,8 +26,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 265830f7b3eb..5bfef9b224f3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -26,8 +26,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java index 51d2a6a84af1..bb3885c008ef 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java index c6fd7cdcbb25..5d1eb9f96273 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java @@ -26,8 +26,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java index 93441f6ab512..83017aa42d76 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java index b2db67005889..0cd983b1b7f9 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java index de05aa0a336a..a3568486879b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java index 7d169d41366d..0a65e65e0d3b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java index c3e65eb4696f..fccd65f8d5a1 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/StoreApiTest.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java index b8e03ee1d4f4..5546daf3eba4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/test/java/org/openapitools/client/api/UserApiTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml index 006eb9f1d8f4..d18bbf583765 100644 --- a/samples/client/petstore/java/rest-assured/pom.xml +++ b/samples/client/petstore/java/rest-assured/pom.xml @@ -258,7 +258,7 @@ 2.10.1 1.9.0 1.3.5 - 3.0.2 + 2.0.2 3.6.0 5.10.3 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 index 8a7c6ddac817..60bd8fc1b2eb 100644 --- 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 @@ -15,8 +15,8 @@ import java.util.Set; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ValidationException; +import javax.validation.ConstraintViolation; +import javax.validation.ValidationException; public class BeanValidationException extends ValidationException { /** diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index d07a015efdf1..52e88b2db2bd 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -28,8 +28,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 500e45c7a32f..842d9fa2bc80 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,8 +35,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 261da66b8df6..0447c8a88c67 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -27,8 +27,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index 751402daef23..3cc3d5e8f1dc 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -30,8 +30,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java index c4fd821c1769..0c4c75f7503e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java @@ -27,8 +27,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java index c7a47bc4e5c8..eab6d35bef0b 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java @@ -28,8 +28,8 @@ import io.restassured.http.Method; import io.restassured.response.Response; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import java.lang.reflect.Type; import java.util.function.Consumer; 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 c5f9795663cb..f5519ee23fae 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 2c52bd46645a..9e1e38c9b524 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 @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 869f571b2cf3..2b12eed789a7 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 cad87d7cd26c..a5310b04d779 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 @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 56106ec5274d..40083bcc14d0 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 7c49908c19e9..b92cacf58801 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 @@ -24,8 +24,8 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 dc09f1b4a966..b78b0149aa50 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 8f35d43cff51..b16998299c04 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 80042ce36dc4..4d7e6a664fcf 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 de673c983288..7610d5c233fb 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 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 ce47753f3a1f..35824ae4e093 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 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 5cfbab473e11..7cd43d63a1ed 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 @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.List; import org.openapitools.client.model.ReadOnlyFirst; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 912a69403885..219ff4705ce4 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Cat; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 819d4d88b1b3..9159e304d639 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 1e03bd241a96..2d440337f35b 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 6761a1a56e44..ea601155325d 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 f0bad58049c9..7d27c2430ccd 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 ab7e53cbe3be..2545b8030492 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 24d47338b439..b9e493f25866 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.Animal; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 6287e754e019..c914ff478c0b 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 @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 3e594e7ef3ef..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,8 +16,8 @@ import java.util.Objects; import java.util.Arrays; import com.google.gson.annotations.SerializedName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; import java.io.IOException; 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 fe7c7f1bab71..1a526187b592 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import org.openapitools.client.model.OuterEnum; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 292097f4471f..f6cb58f4f350 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,8 +25,8 @@ import java.util.Arrays; import java.util.List; import org.openapitools.client.model.ModelFile; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 fdcf2d962991..092e792b59b5 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 @@ -26,8 +26,8 @@ import java.time.LocalDate; import java.time.OffsetDateTime; import java.util.UUID; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 cd3983d09f04..9359b3d6b3a1 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 aaa2acc7543b..07e23a4fadbd 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 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 ee4a8fc879bc..6aa85b73aa44 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 @@ -26,8 +26,8 @@ import java.util.Map; import java.util.UUID; import org.openapitools.client.model.Animal; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 ec8345ae6305..4305b022b01d 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 7fd95acc872a..fe4642cb8bd4 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java index 8444424da2a4..8960387f3a24 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java index 1dd3f85cef78..fe3429c6b766 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 5ad31c357e64..692bcc734ef5 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 998b54cb5f3f..be4b4e2fa0fa 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 b4847abfea8d..6f51fd10ff03 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 50974ed18a42..9ab705ddab24 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.time.OffsetDateTime; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 f73d62c7d749..3373fa0fe86b 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 @@ -22,8 +22,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.math.BigDecimal; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 5cf2df009652..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,8 +16,8 @@ import java.util.Objects; import java.util.Arrays; import com.google.gson.annotations.SerializedName; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; import java.io.IOException; 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 da21370260e2..8943a77dfa8f 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 @@ -28,8 +28,8 @@ import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 07187feaa613..70bbf4e74c23 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 afc49d795e65..dfcd575eda28 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 ca233f79375f..8d9d5cc3e3ba 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 a10b6b0a68b0..c9fba576feac 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 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 914b0086756c..19d48c9a5afe 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 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 9c026d72c9df..5d454455a0fc 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 @@ -21,8 +21,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** 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 5ecfdb53e848..40d0e558dac2 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 @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import org.hibernate.validator.constraints.*; /** diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java index 98ae595b408f..02d95584eddd 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java index a7abe7c1e752..936e7153aa97 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java index fa03b6cd79b4..3e405aee8f41 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/PetApiTest.java index ad4bf4ca0b0c..30e1199aa10b 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/StoreApiTest.java index 8463e0282404..4bee67aeab7b 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/StoreApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/StoreApiTest.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/UserApiTest.java index cbb964e6209c..cf96c3b2d1cd 100644 --- a/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/UserApiTest.java +++ b/samples/client/petstore/java/rest-assured/src/test/java/org/openapitools/client/api/UserApiTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -import jakarta.validation.constraints.*; -import jakarta.validation.Valid; +import javax.validation.constraints.*; +import javax.validation.Valid; import static io.restassured.config.ObjectMapperConfig.objectMapperConfig; import static io.restassured.config.RestAssuredConfig.config; diff --git a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml index 789ad3977358..e744bf677ff9 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml +++ b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml @@ -285,6 +285,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/restclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/restclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java index 7552e150548c..f668338d40ad 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/restclient-nullable-arrays/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.ByteArrayObject; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for DefaultApi */ -@Ignore +@Disabled public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/pom.xml b/samples/client/petstore/java/restclient-swagger2/pom.xml index 5670fabdbc59..fd0cc38e229a 100644 --- a/samples/client/petstore/java/restclient-swagger2/pom.xml +++ b/samples/client/petstore/java/restclient-swagger2/pom.xml @@ -291,6 +291,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java index f17f97c4def1..9960e0bec21f 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Client; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for AnotherFakeApi */ -@Ignore +@Disabled public class AnotherFakeApiTest { private final AnotherFakeApi api = new AnotherFakeApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/DefaultApiTest.java index be7d082abc61..6a143cec05bd 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.FooGetDefaultResponse; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for DefaultApi */ -@Ignore +@Disabled public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java index fd55e7b08a6e..232d5f66bdf0 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -28,8 +28,8 @@ import org.openapitools.client.model.Pet; import org.openapitools.client.model.TestInlineFreeformAdditionalPropertiesRequest; import org.openapitools.client.model.User; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -40,7 +40,7 @@ /** * API tests for FakeApi */ -@Ignore +@Disabled public class FakeApiTest { private final FakeApi api = new FakeApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java index 9b9e18fb2339..b5902a7bafa6 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Client; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for FakeClassnameTags123Api */ -@Ignore +@Disabled public class FakeClassnameTags123ApiTest { private final FakeClassnameTags123Api api = new FakeClassnameTags123Api(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/PetApiTest.java index 005740d942a3..ad5e55343b73 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -17,8 +17,8 @@ import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +29,7 @@ /** * API tests for PetApi */ -@Ignore +@Disabled public class PetApiTest { private final PetApi api = new PetApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/StoreApiTest.java index 682b18f0b1d3..323ed1ee3403 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/StoreApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/StoreApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Order; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for StoreApi */ -@Ignore +@Disabled public class StoreApiTest { private final StoreApi api = new StoreApi(); diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/UserApiTest.java index a0323a123514..8d57a6b24a94 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/UserApiTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/UserApiTest.java @@ -15,8 +15,8 @@ import java.time.OffsetDateTime; import org.openapitools.client.model.User; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +27,7 @@ /** * API tests for UserApi */ -@Ignore +@Disabled public class UserApiTest { private final UserApi api = new UserApi(); diff --git a/samples/client/petstore/java/restclient/pom.xml b/samples/client/petstore/java/restclient/pom.xml index f53b4974b3ee..ff4d29f2afad 100644 --- a/samples/client/petstore/java/restclient/pom.xml +++ b/samples/client/petstore/java/restclient/pom.xml @@ -285,6 +285,7 @@ 2.17.1 0.2.6 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java index f17f97c4def1..9960e0bec21f 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Client; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for AnotherFakeApi */ -@Ignore +@Disabled public class AnotherFakeApiTest { private final AnotherFakeApi api = new AnotherFakeApi(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java index be7d082abc61..6a143cec05bd 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.FooGetDefaultResponse; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for DefaultApi */ -@Ignore +@Disabled public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java index fd55e7b08a6e..232d5f66bdf0 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -28,8 +28,8 @@ import org.openapitools.client.model.Pet; import org.openapitools.client.model.TestInlineFreeformAdditionalPropertiesRequest; import org.openapitools.client.model.User; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -40,7 +40,7 @@ /** * API tests for FakeApi */ -@Ignore +@Disabled public class FakeApiTest { private final FakeApi api = new FakeApi(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java index 9b9e18fb2339..b5902a7bafa6 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Client; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for FakeClassnameTags123Api */ -@Ignore +@Disabled public class FakeClassnameTags123ApiTest { private final FakeClassnameTags123Api api = new FakeClassnameTags123Api(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/PetApiTest.java index 005740d942a3..ad5e55343b73 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -17,8 +17,8 @@ import org.openapitools.client.model.ModelApiResponse; import org.openapitools.client.model.Pet; import java.util.Set; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +29,7 @@ /** * API tests for PetApi */ -@Ignore +@Disabled public class PetApiTest { private final PetApi api = new PetApi(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/StoreApiTest.java index 682b18f0b1d3..323ed1ee3403 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/StoreApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/StoreApiTest.java @@ -14,8 +14,8 @@ package org.openapitools.client.api; import org.openapitools.client.model.Order; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -26,7 +26,7 @@ /** * API tests for StoreApi */ -@Ignore +@Disabled public class StoreApiTest { private final StoreApi api = new StoreApi(); diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/UserApiTest.java index a0323a123514..8d57a6b24a94 100644 --- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/UserApiTest.java +++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/UserApiTest.java @@ -15,8 +15,8 @@ import java.time.OffsetDateTime; import org.openapitools.client.model.User; -import org.junit.Test; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +27,7 @@ /** * API tests for UserApi */ -@Ignore +@Disabled public class UserApiTest { private final UserApi api = new UserApi(); diff --git a/samples/client/petstore/java/resttemplate-jakarta/build.gradle b/samples/client/petstore/java/resttemplate-jakarta/build.gradle index 4c7ab0d269a3..5cb604aa3ad0 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/build.gradle +++ b/samples/client/petstore/java/resttemplate-jakarta/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "6.1.5" jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/petstore/java/resttemplate-jakarta/pom.xml b/samples/client/petstore/java/resttemplate-jakarta/pom.xml index a832c2b69ca1..aecfefda7b5d 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/pom.xml +++ b/samples/client/petstore/java/resttemplate-jakarta/pom.xml @@ -280,11 +280,12 @@ UTF-8 - 6.1.5 2.17.1 2.17.1 0.2.6 + 6.1.5 2.1.1 + 3.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/resttemplate-swagger1/build.gradle b/samples/client/petstore/java/resttemplate-swagger1/build.gradle index 42f909e68f7e..903eb4f522f6 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/build.gradle +++ b/samples/client/petstore/java/resttemplate-swagger1/build.gradle @@ -103,6 +103,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/petstore/java/resttemplate-swagger1/pom.xml b/samples/client/petstore/java/resttemplate-swagger1/pom.xml index 3d4372703958..da5f1d42eca8 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/pom.xml +++ b/samples/client/petstore/java/resttemplate-swagger1/pom.xml @@ -286,11 +286,12 @@ UTF-8 1.6.9 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/resttemplate-swagger2/build.gradle b/samples/client/petstore/java/resttemplate-swagger2/build.gradle index 5be16c73cced..bf41a5be2312 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/build.gradle +++ b/samples/client/petstore/java/resttemplate-swagger2/build.gradle @@ -103,6 +103,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/petstore/java/resttemplate-swagger2/pom.xml b/samples/client/petstore/java/resttemplate-swagger2/pom.xml index 35c924e2a5d3..dab9814c6c99 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/pom.xml +++ b/samples/client/petstore/java/resttemplate-swagger2/pom.xml @@ -286,11 +286,12 @@ UTF-8 2.2.15 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index a6e41305ff52..a8f3fb4192c4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index d5e58767e811..473667b8ed93 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -292,11 +292,12 @@ UTF-8 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 1633ff284dfe..7925740c3112 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -102,6 +102,7 @@ ext { jackson_databind_nullable_version = "0.2.6" spring_web_version = "5.3.33" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" jodatime_version = "2.9.9" junit_version = "5.10.2" } diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 67bafe0aac79..dd2d23b6cc02 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -280,11 +280,12 @@ UTF-8 - 5.3.33 2.17.1 2.17.1 0.2.6 + 5.3.33 1.3.5 + 2.0.2 5.10.2 1.10.0 diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 91b4fb6f8104..6d6b141c5900 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -264,6 +264,7 @@ 1.6.3 2.11.0 1.3.5 + 2.0.2 1.0.1 5.10.3 diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index 4a80f82a70d2..6fac9aa35c34 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -275,6 +275,7 @@ 2.11.0 2.1.1 1.3.5 + 2.0.2 1.0.1 5.10.3 diff --git a/samples/client/petstore/java/retrofit2rx3/pom.xml b/samples/client/petstore/java/retrofit2rx3/pom.xml index 19fae28dad5b..7b7b537d83de 100644 --- a/samples/client/petstore/java/retrofit2rx3/pom.xml +++ b/samples/client/petstore/java/retrofit2rx3/pom.xml @@ -275,6 +275,7 @@ 2.11.0 3.0.4 1.3.5 + 2.0.2 1.0.1 5.10.3 diff --git a/samples/client/petstore/java/webclient-jakarta/build.gradle b/samples/client/petstore/java/webclient-jakarta/build.gradle index d9b1cf99575c..e64b0c5445d8 100644 --- a/samples/client/petstore/java/webclient-jakarta/build.gradle +++ b/samples/client/petstore/java/webclient-jakarta/build.gradle @@ -114,6 +114,7 @@ if(hasProperty('target') && target == 'android') { ext { spring_boot_version = "3.0.12" jakarta_annotation_version = "2.1.1" + beanvalidation_version = "3.0.2" reactor_version = "3.5.12" reactor_netty_version = "1.1.13" jackson_version = "2.17.1" diff --git a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle index c19d76553ed4..6d04524a96d9 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/build.gradle +++ b/samples/client/petstore/java/webclient-nullable-arrays/build.gradle @@ -114,6 +114,7 @@ if(hasProperty('target') && target == 'android') { ext { spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" reactor_version = "3.4.34" reactor_netty_version = "1.0.39" jackson_version = "2.17.1" diff --git a/samples/client/petstore/java/webclient-swagger2/build.gradle b/samples/client/petstore/java/webclient-swagger2/build.gradle index 8aa7b57c5035..e643eadeb709 100644 --- a/samples/client/petstore/java/webclient-swagger2/build.gradle +++ b/samples/client/petstore/java/webclient-swagger2/build.gradle @@ -115,6 +115,7 @@ ext { swagger_annotations_version = "2.2.9" spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" reactor_version = "3.4.34" reactor_netty_version = "1.0.39" jackson_version = "2.17.1" diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 50d64376e7b7..fb2dce8df131 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -114,6 +114,7 @@ if(hasProperty('target') && target == 'android') { ext { spring_boot_version = "2.7.17" jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" reactor_version = "3.4.34" reactor_netty_version = "1.0.39" jackson_version = "2.17.1" diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml index d1d6000a8eb3..8b36afad0dce 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/pom.xml @@ -333,6 +333,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 2.21.0 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml index 732baf1283a9..e9b2b57c298c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/pom.xml @@ -333,6 +333,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 2.21.0 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/pom.xml index b549f6c5842a..61c396d8d9c3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/pom.xml @@ -344,6 +344,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 8.3.3 2.21.0 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/pom.xml index 437ee5f4386d..193a5d6846ae 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/pom.xml @@ -344,6 +344,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 8.3.3 2.21.0 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml index 084329bf033c..a927083dc554 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml @@ -343,6 +343,7 @@ 2.17.1 0.2.6 1.3.5 + 2.0.2 5.10.0 1.8 8.3.3