[Java Libraries] Jakarta Validation API support useJakartaEe flag (#19469)

* Jakarta Validation API support useJakartaEe flag

* Jakarta Validation API support useJakartaEe flag

modules/openapi-generator/src/main/resources/Java/BeanValidationException.mustache

@@ -4,8 +4,8 @@ package {{invokerPackage}};
 
 import java.util.Set;
 
-import jakarta.validation.ConstraintViolation;
+import {{javaxPackage}}.validation.ConstraintViolation;
-import jakarta.validation.ValidationException;
+import {{javaxPackage}}.validation.ValidationException;
 
 public class BeanValidationException extends ValidationException {
     /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 {{>generatedAnnotation}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache

@@ -358,13 +358,12 @@
         {{/openApiNullable}}
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <junit-version>5.10.2</junit-version>
     </properties>
 </project>

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import feign.*;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache

@@ -403,13 +403,12 @@
         {{/openApiNullable}}
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <scribejava-version>8.3.3</scribejava-version>

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import java.util.ArrayList;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache

@@ -401,13 +401,12 @@
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <junit-version>5.10.0</junit-version>
         {{#hasHttpSignatureMethods}}
         <http-signature-version>1.8</http-signature-version>

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pom.mustache

@@ -400,9 +400,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        {{#useBeanValidation}}
         <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <junit-version>5.10.0</junit-version>
         {{#hasHttpSignatureMethods}}
         <http-signature-version>1.8</http-signature-version>

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 {{#hasFormParamsInSpec}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache

@@ -295,13 +295,12 @@
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         {{#hasFormParamsInSpec}}
         <httpmime-version>4.5.14</httpmime-version>
         {{/hasFormParamsInSpec}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
-import jakarta.validation.ConstraintViolation;
+import {{javaxPackage}}.validation.ConstraintViolation;
-import jakarta.validation.Validation;
+import {{javaxPackage}}.validation.Validation;
-import jakarta.validation.ValidatorFactory;
+import {{javaxPackage}}.validation.ValidatorFactory;
-import jakarta.validation.executable.ExecutableValidator;
+import {{javaxPackage}}.validation.executable.ExecutableValidator;
 import java.util.Set;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

@@ -423,16 +423,15 @@
         {{/joda}}
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{#performBeanValidation}}
         <jakarta.el-version>3.0.3</jakarta.el-version>
         {{/performBeanValidation}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 
 import java.lang.reflect.Type;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import static io.restassured.config.ObjectMapperConfig.objectMapperConfig;

modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache

@@ -358,13 +358,12 @@
         {{/jackson}}
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <okio-version>3.6.0</okio-version>
         <junit-version>5.10.3</junit-version>
     </properties>

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;

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.jupiter.api.Disabled;
-import org.junit.Ignore;
+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}}();

modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache

@@ -362,9 +362,7 @@
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
-        {{#useBeanValidation}}
         <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         {{#performBeanValidation}}
         <hibernate-validator-version>5.4.3.Final</hibernate-validator-version>
         {{/performBeanValidation}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import org.springframework.beans.factory.annotation.Autowired;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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"

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -367,29 +367,24 @@
         {{#swagger2AnnotationLibrary}}
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        {{#useJakartaEe}}
-        <spring-web-version>6.1.5</spring-web-version>
-        {{/useJakartaEe}}
-        {{^useJakartaEe}}
-        <spring-web-version>5.3.33</spring-web-version>
-        {{/useJakartaEe}}
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         {{#openApiNullable}}
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         {{/openApiNullable}}
         {{#useJakartaEe}}
+        <spring-web-version>6.1.5</spring-web-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
+        <spring-web-version>5.3.33</spring-web-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         {{#performBeanValidation}}
         <hibernate-validator-version>5.4.3.Final</hibernate-validator-version>
         {{/performBeanValidation}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 {{#operations}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 
 import java.util.ArrayList;

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache

@@ -405,13 +405,12 @@
         {{/joda}}
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-        {{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useBeanValidation}}
         <oltu-version>1.0.1</oltu-version>
         <junit-version>5.10.3</junit-version>
     </properties>

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 import org.springframework.beans.factory.annotation.Autowired;

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 /**

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}}

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 {{javaxPackage}}.validation.constraints.*;
-import jakarta.validation.Valid;
+import {{javaxPackage}}.validation.Valid;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
 import org.hibernate.validator.constraints.*;

modules/openapi-generator/src/main/resources/Java/pom.mustache

@@ -368,13 +368,12 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         {{#useJakartaEe}}
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         {{/useJakartaEe}}
         {{^useJakartaEe}}
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         {{/useJakartaEe}}
-{{#useBeanValidation}}
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-{{/useBeanValidation}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>

samples/client/echo_api/java/apache-httpclient/pom.xml

@@ -274,6 +274,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
     </properties>
 </project>

samples/client/echo_api/java/feign-gson/pom.xml

@@ -305,6 +305,7 @@
         <gson-version>2.10.1</gson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <scribejava-version>8.3.3</scribejava-version>

samples/client/echo_api/java/native/pom.xml

@@ -256,6 +256,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <httpmime-version>4.5.14</httpmime-version>
         <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>

samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml

@@ -334,6 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/echo_api/java/okhttp-gson/pom.xml

@@ -329,6 +329,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/echo_api/java/restclient/pom.xml

@@ -285,6 +285,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>

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 org.junit.jupiter.api.Disabled;
-import static org.hamcrest.MatcherAssert.assertThat;
+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
      *
-     * <p>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
         String response = api.testAuthHttpBasic();
 
-        assertThat(
+        // TODO: test validations
-                response,
-                containsString("Authorization: Basic dGVzdF91c2VyOnRlc3RfcGFzc3dvcmQ="));
     }
     
     /**
      * To test HTTP bearer authentication
      *
-     * <p>To test HTTP bearer authentication
+     * To test HTTP bearer authentication
      */
     @Test
     public void testAuthHttpBearerTest()  {
-        // given
-        api.getApiClient().setBearerToken("test_token");
-
-        // when
         String response = api.testAuthHttpBearer();
 
-        assertThat(response, containsString("Authorization: Bearer test_token"));
+        // TODO: test validations
     }
+    
 }

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;
-
 import java.io.File;
-import java.io.IOException;
+import org.openapitools.client.model.Pet;
-import java.nio.file.Files;
+import org.openapitools.client.model.StringEnumRef;
+import org.openapitools.client.model.Tag;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import java.util.stream.Collectors;
-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;
 
-/** API tests for BodyApi */
+/**
+ * API tests for BodyApi
+ */
+@Disabled
 public class BodyApiTest {
 
     private final BodyApi api = new BodyApi();
 
+    
     /**
      * Test binary (gif) response body
      *
-   * <p>Test binary (gif) response body
+     * Test binary (gif) response body
      */
     @Test
-  public void testBinaryGifTest() throws IOException {
+    public void testBinaryGifTest()  {
-    // given
-    var restClient =
-        ApiClient.buildRestClientBuilder()
-            .messageConverters(converters -> converters.add(new GifHttpMessageConverter()))
-            .build();
-    api.setApiClient(new ApiClient(restClient));
-
-    // when
         File response = api.testBinaryGif();
 
-    // then
+        // TODO: test validations
-    assertThat(response, notNullValue());
-    assertThat(response.exists(), is(true));
-    assertThat(Files.probeContentType(response.toPath()), is("image/gif"));
     }
     
     /**
      * Test body parameter(s)
      *
-   * <p>Test body parameter(s)
+     * Test body parameter(s)
      */
     @Test
-  public void testBodyApplicationOctetstreamBinaryTest() throws IOException {
+    public void testBodyApplicationOctetstreamBinaryTest()  {
-    // given
+        File body = null;
-    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
+        // TODO: test validations
-    assertThat(response, containsString("Content-Type: application/octet-stream"));
-    assertThat(response, containsString("test123"));
     }
     
     /**
      * Test array of binary in multipart mime
      *
-   * <p>Test array of binary in multipart mime
+     * Test array of binary in multipart mime
      */
     @Test
-  public void testBodyMultipartFormdataArrayOfBinaryTest() throws IOException {
+    public void testBodyMultipartFormdataArrayOfBinaryTest()  {
-    // given
+        List<File> files = null;
-    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<File> files = List.of(firstFile.toFile(), secondFile.toFile());
-
-    // when
         String response = api.testBodyMultipartFormdataArrayOfBinary(files);
 
-    // then
+        // TODO: test validations
-    assertThat(response, containsString("Content-Type: multipart/form-data"));
-    assertThat(response, containsString(firstFileContent));
-    assertThat(response, containsString(secondFileContent));
     }
     
     /**
      * Test single binary in multipart mime
      *
-   * <p>Test single binary in multipart mime
+     * Test single binary in multipart mime
      */
     @Test
-  public void testBodyMultipartFormdataSingleBinaryTest() throws IOException {
+    public void testBodyMultipartFormdataSingleBinaryTest()  {
-    // given
+        File myFile = null;
-    var testFile = Files.createTempFile("test", ".txt");
+        String response = api.testBodyMultipartFormdataSingleBinary(myFile);
-    String testFileContent = "Lorem ipsum dolor sit amet";
-    Files.writeString(testFile, testFileContent);
 
-    // when
+        // TODO: test validations
-    String response = api.testBodyMultipartFormdataSingleBinary(testFile.toFile());
-
-    // then
-    assertThat(response, containsString("Content-Type: multipart/form-data"));
-    assertThat(response, containsString(testFileContent));
     }
     
     /**
      * Test body parameter(s)
      *
-   * <p>Test body parameter(s)
+     * Test body parameter(s)
      */
     @Test
     public void testEchoBodyAllOfPetTest()  {
-    // given
+        Pet pet = null;
-    // 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
+        // TODO: test validations
-    assertThat(response, is(pet));
     }
     
     /**
      * Test free form object
      *
-   * <p>Test free form object
+     * Test free form object
      */
     @Test
     public void testEchoBodyFreeFormObjectResponseStringTest()  {
-    // given
+        Object body = null;
-    // The content length must be set to disable the Transfer-Encoding: chunked which would lead to
+        String response = api.testEchoBodyFreeFormObjectResponseString(body);
-    // unparsable response because the echo server is replying them as body.
-    api.getApiClient().addDefaultHeader("Content-Length", "51");
 
-    Object mapAsObject =
+        // TODO: test validations
-        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)
      *
-   * <p>Test body parameter(s)
+     * Test body parameter(s)
      */
     @Test
     public void testEchoBodyPetTest()  {
-    // given
+        Pet pet = null;
-    // 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
+        // TODO: test validations
-    assertThat(response, is(pet));
     }
     
     /**
      * Test empty response body
      *
-   * <p>Test empty response body
+     * Test empty response body
      */
     @Test
     public void testEchoBodyPetResponseStringTest()  {
-    // given
+        Pet pet = null;
-    // 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
+        // TODO: test validations
-    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
      *
-   * <p>Test string enum response body
+     * Test string enum response body
      */
     @Test
     public void testEchoBodyStringEnumTest()  {
-    // given
+        String body = null;
-    String body = "\"failure\"";
-
-    // when
         StringEnumRef response = api.testEchoBodyStringEnum(body);
 
-    // then
+        // TODO: test validations
-    assertThat(response, is(StringEnumRef.FAILURE));
     }
     
     /**
      * Test empty json (request body)
      *
-   * <p>Test empty json (request body)
+     * Test empty json (request body)
      */
     @Test
     public void testEchoBodyTagResponseStringTest()  {
-    // given
         Tag tag = null;
-
-    // when
         String response = api.testEchoBodyTagResponseString(tag);
 
-    // then
+        // TODO: test validations
-    assertThat(response, nullValue());
     }
+    
 }

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;
-
-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 */
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * API tests for FormApi
+ */
+@Disabled
 public class FormApiTest {
 
     private final FormApi api = new FormApi();
 
+    
     /**
      * Test form parameter(s)
      *
-   * <p>Test form parameter(s)
+     * Test form parameter(s)
      */
     @Test
     public void testFormIntegerBooleanStringTest()  {
-    // Given
+        Integer integerForm = null;
-    // The content length must be set to disable the Transfer-Encoding: chunked which would lead to
+        Boolean booleanForm = null;
-    // unparsable response because the echo server is replying them as body.
+        String stringForm = null;
-    api.getApiClient().addDefaultHeader("Content-Length", "53");
-
-    Integer integerForm = 42;
-    Boolean booleanForm = true;
-    String stringForm = "Test123";
-
-    // When
         String response = api.testFormIntegerBooleanString(integerForm, booleanForm, stringForm);
 
-    // Then
+        // TODO: test validations
-    assertThat(response, containsString("integer_form=42&boolean_form=true&string_form=Test123"));
     }
     
     /**
      * Test form parameter(s) for multipart schema
      *
-   * <p>Test form parameter(s) for multipart schema
+     * Test form parameter(s) for multipart schema
      */
     @Test
     public void testFormObjectMultipartTest()  {
-    // Given
+        TestFormObjectMultipartRequestMarker marker = null;
-    TestFormObjectMultipartRequestMarker marker =
-        new TestFormObjectMultipartRequestMarker().name("Test Marker");
-
-    // When
         String response = api.testFormObjectMultipart(marker);
 
-    // Then
+        // TODO: test validations
-    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
      *
-   * <p>Test form parameter(s) for oneOf schema
+     * Test form parameter(s) for oneOf schema
      */
     @Test
-  public void testFormOneofTest_first() {
+    public void testFormOneofTest()  {
-    // 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"));
-  }
-
-  /**
-   * Test form parameter(s) for oneOf schema with only the second parameters filled
-   *
-   * <p>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
-   *
-   * <p>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 = null;
-    Long id = 21L;
+        String name = null;
-    String name = "Hans";
-
-    // When
         String response = api.testFormOneof(form1, form2, form3, form4, id, name);
 
-    // Then
+        // TODO: test validations
-    assertThat(response, containsString("id=21&name=Hans"));
     }
     
-  /**
-   * Test form parameter(s) for oneOf schema with all parameters filled
-   *
-   * <p>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);
-
-    // Then
-    assertThat(
-        response, containsString("form1=test12&form2=12&form3=34test&form4=false&id=21&name=Hans"));
-  }
 }

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;
-
-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)
      *
-   * <p>Test header parameter(s)
+     * Test header parameter(s)
      */
     @Test
     public void testHeaderIntegerBooleanStringEnumsTest()  {
-    // Given
+        Integer integerHeader = null;
-    Integer integerHeader = 11;
+        Boolean booleanHeader = null;
-    Boolean booleanHeader = true;
+        String stringHeader = null;
-    String stringHeader = "simple String Header";
+        String enumNonrefStringHeader = null;
-    String enumNonrefStringHeader = "false";
+        StringEnumRef enumRefStringHeader = null;
-    StringEnumRef enumRefStringHeader = StringEnumRef.UNCLASSIFIED;
+        String response = api.testHeaderIntegerBooleanStringEnums(integerHeader, booleanHeader, stringHeader, enumNonrefStringHeader, enumRefStringHeader);
 
-    // When
+        // TODO: test validations
-    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")));
     }
+    
 }

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;
-
-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)
      *
-   * <p>Test path parameter(s)
+     * Test path parameter(s)
      */
     @Test
-  public void
+    public void testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest()  {
-      testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathTest() {
+        String pathString = null;
-    // Given
+        Integer pathInteger = null;
-    String pathString = "simple String Path";
+        String enumNonrefStringPath = null;
-    Integer pathInteger = 50;
+        StringEnumRef enumRefStringPath = null;
-    String enumNonrefStringPath = "true";
+        String response = api.testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(pathString, pathInteger, enumNonrefStringPath, enumRefStringPath);
-    StringEnumRef enumRefStringPath = StringEnumRef.SUCCESS;
 
-    // When
+        // TODO: test validations
-    String response =
-        api.testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(
-            pathString, pathInteger, enumNonrefStringPath, enumRefStringPath);
-
-    // Then
-    assertThat(
-        response, containsString("/path/string/simple%20String%20Path/integer/50/true/success"));
     }
+    
 }

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;
-
-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)
      *
-   * <p>Test query parameter(s)
+     * Test query parameter(s)
      */
     @Test
     public void testEnumRefStringTest()  {
-    // Given
+        String enumNonrefStringQuery = null;
-    String enumNonrefStringQuery = "false";
+        StringEnumRef enumRefStringQuery = null;
-    StringEnumRef enumRefStringQuery = StringEnumRef.SUCCESS;
-
-    // When
         String response = api.testEnumRefString(enumNonrefStringQuery, enumRefStringQuery);
 
-    // Then
+        // TODO: test validations
-    assertThat(
-        response, containsString("?enum_nonref_string_query=false&enum_ref_string_query=success"));
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>Test query parameter(s)
+     * Test query parameter(s)
      */
     @Test
     public void testQueryDatetimeDateStringTest()  {
-    // Given
+        Instant datetimeQuery = null;
-    Instant datetimeQuery = Instant.ofEpochMilli(1720361075);
+        LocalDate dateQuery = null;
-    LocalDate dateQuery = LocalDate.of(2024, 7, 7);
+        String stringQuery = null;
-    String stringQuery = "2024-07-07T16:05:59Z";
-
-    // When
         String response = api.testQueryDatetimeDateString(datetimeQuery, dateQuery, stringQuery);
 
-    // Then
+        // TODO: test validations
-    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)
      *
-   * <p>Test query parameter(s)
+     * Test query parameter(s)
      */
     @Test
     public void testQueryIntegerBooleanStringTest()  {
-    // Given
+        Integer integerQuery = null;
-    Integer integerQuery = 42;
+        Boolean booleanQuery = null;
-    Boolean booleanQuery = false;
+        String stringQuery = null;
-    String stringQuery = "Hello World!";
-
-    // When
         String response = api.testQueryIntegerBooleanString(integerQuery, booleanQuery, stringQuery);
 
-    // Then
+        // TODO: test validations
-    assertThat(
-        response,
-        containsString("?integer_query=42&boolean_query=false&string_query=Hello%20World%21"));
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>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
+        // TODO: test validations
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>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
+        // TODO: test validations
-    // operations are currently not supported
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>Test query parameter(s)
+     * Test query parameter(s)
      */
     @Test
     public void testQueryStyleFormExplodeFalseArrayIntegerTest()  {
-    // Given
+        List<Integer> queryObject = null;
-    List<Integer> queryObject = List.of(1, 6, 2, 5, 3, 4);
-
-    // When
         String response = api.testQueryStyleFormExplodeFalseArrayInteger(queryObject);
 
-    // Then
+        // TODO: test validations
-    assertThat(response, containsString("?query_object=1%2C6%2C2%2C5%2C3%2C4"));
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>Test query parameter(s)
+     * Test query parameter(s)
      */
     @Test
     public void testQueryStyleFormExplodeFalseArrayStringTest()  {
-    // Given
+        List<String> queryObject = null;
-    List<String> queryObject = List.of("Hello", "World");
-
-    // When
         String response = api.testQueryStyleFormExplodeFalseArrayString(queryObject);
 
-    // Then
+        // TODO: test validations
-    assertThat(response, containsString("?query_object=Hello%2CWorld"));
     }
     
     /**
      * Test query parameter(s)
      *
-   * <p>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 = null;
-    TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter queryObject =
-        new TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter()
-            .addValuesItem("Hello")
-            .addValuesItem("Hallo")
-            .addValuesItem("Bonjour");
-
-    // When
         String response = api.testQueryStyleFormExplodeTrueArrayString(queryObject);
 
-    // Then
+        // TODO: test validations
-    // 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)
      *
-   * <p>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)
      *
-   * <p>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
     }
+    
 }

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"
 }

samples/client/echo_api/java/resttemplate/pom.xml

@@ -280,11 +280,12 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>

samples/client/others/java/jersey2-oneOf-Mixed/pom.xml

@@ -333,6 +333,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <spotless.version>2.21.0</spotless.version>
     </properties>

samples/client/others/java/jersey2-oneOf-duplicates/pom.xml

@@ -333,6 +333,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <spotless.version>2.21.0</spotless.version>
     </properties>

samples/client/others/java/okhttp-gson-oneOf/pom.xml

@@ -329,6 +329,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/others/java/okhttp-gson-streaming/pom.xml

@@ -329,6 +329,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/others/java/restclient-useAbstractionForFiles/pom.xml

@@ -285,6 +285,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>

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.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 /**
  * API tests for ResourceApi
  */
-@Ignore
+@Disabled
 public class ResourceApiTest {
 
     private final ResourceApi api = new ResourceApi();

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"
 }

samples/client/others/java/resttemplate-list-schema-validation/pom.xml

@@ -287,12 +287,12 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>

samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/api/UserApi.java

@@ -11,8 +11,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

samples/client/others/java/resttemplate-list-schema-validation/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 /**
  * API tests for UserApi

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"
 }

samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml

@@ -280,11 +280,12 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>5.3.33</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
+        <spring-web-version>5.3.33</spring-web-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>

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"

samples/client/petstore/java/apache-httpclient/pom.xml

@@ -274,6 +274,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.2</junit-version>
     </properties>
 </project>

samples/client/petstore/java/feign-no-nullable/pom.xml

@@ -316,6 +316,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <scribejava-version>8.3.3</scribejava-version>

samples/client/petstore/java/feign/pom.xml

@@ -322,6 +322,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <scribejava-version>8.3.3</scribejava-version>

samples/client/petstore/java/jersey2-java8-localdatetime/pom.xml

@@ -338,6 +338,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <scribejava-apis-version>8.3.3</scribejava-apis-version>
         <spotless.version>2.21.0</spotless.version>

samples/client/petstore/java/jersey2-java8/pom.xml

@@ -338,6 +338,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.0</junit-version>
         <scribejava-apis-version>8.3.3</scribejava-apis-version>
         <spotless.version>2.21.0</spotless.version>

samples/client/petstore/java/native-async/pom.xml

@@ -256,6 +256,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <httpmime-version>4.5.14</httpmime-version>
         <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>

samples/client/petstore/java/native-jakarta/pom.xml

@@ -256,6 +256,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
+        <beanvalidation-version>3.0.2</beanvalidation-version>
         <httpmime-version>4.5.14</httpmime-version>
         <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>

samples/client/petstore/java/native/pom.xml

@@ -256,6 +256,7 @@
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <httpmime-version>4.5.14</httpmime-version>
         <junit-version>5.10.2</junit-version>
         <spotless.version>2.27.2</spotless.version>

samples/client/petstore/java/okhttp-gson-3.1/pom.xml

@@ -334,6 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml

@@ -339,6 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml

@@ -339,6 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml

@@ -334,6 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml

@@ -334,6 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml

@@ -341,6 +341,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-swagger1/pom.xml

@@ -340,6 +340,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/okhttp-gson-swagger2/pom.xml

@@ -340,6 +340,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <junit-version>5.10.3</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <jakarta.ws.rs-api-version>2.1.6</jakarta.ws.rs-api-version>

samples/client/petstore/java/rest-assured-jackson/pom.xml

@@ -284,7 +284,7 @@
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
+        <beanvalidation-version>2.0.2</beanvalidation-version>
         <okio-version>3.6.0</okio-version>
         <junit-version>5.10.3</junit-version>
     </properties>

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/BeanValidationException.java

@@ -15,8 +15,8 @@ package org.openapitools.client;
 
 import java.util.Set;
 
-import jakarta.validation.ConstraintViolation;
+import javax.validation.ConstraintViolation;
-import jakarta.validation.ValidationException;
+import javax.validation.ValidationException;
 
 public class BeanValidationException extends ValidationException {
     /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -28,8 +28,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java

@@ -35,8 +35,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java

@@ -27,8 +27,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/PetApi.java

@@ -30,8 +30,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/StoreApi.java

@@ -27,8 +27,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/UserApi.java

@@ -28,8 +28,8 @@ import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.Method;
 import io.restassured.response.Response;
 
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.lang.reflect.Type;
 import java.util.function.Consumer;

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**

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.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.hibernate.validator.constraints.*;
 
 /**