import @Valid in Spring delegates (#15330) (fix #15213)

OpenAPITools · May 15, 2023 · dd6ccaa · dd6ccaa
1 parent 54cb33c
commit dd6ccaa
Show file tree

Hide file tree

Showing 42 changed files with 44 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
@@ -16,6 +16,9 @@ import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 {{/reactive}}
 
+{{#useBeanValidation}}
+import {{javaxPackage}}.validation.Valid;
+{{/useBeanValidation}}
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...tstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...tstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -18,6 +18,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/.../springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/.../springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...erver/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/...erver/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ver/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...ver/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...ore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -18,6 +18,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ringboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/...ringboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...er/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/...er/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/.../petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/.../petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/...r/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ngboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java b/...ngboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...boot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...boot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...gboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java b/...gboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...tstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...tstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -18,6 +18,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/.../springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/.../springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...erver/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/...erver/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ver/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...ver/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/...rver/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...tstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...tstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -12,6 +12,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -23,6 +23,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/.../springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/.../springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -12,6 +12,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...erver/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/...erver/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -14,6 +14,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ver/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...ver/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -13,6 +13,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java b/...rver/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -14,6 +14,7 @@
 import reactor.core.publisher.Mono;
 import org.springframework.http.codec.multipart.Part;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...geable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...geable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -17,6 +17,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...tePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/...tePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/...ageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -10,6 +10,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...eable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...eable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...geable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/...geable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApiDelegate.java b/...-delegatePattern-without-j8/src/main/java/org/openapitools/api/VersioningApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...g-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java b/...g-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...t-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/...t-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -17,6 +17,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...able-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java b/...able-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java b/...ot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java
@@ -10,6 +10,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java b/...-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java
@@ -8,6 +8,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...t-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java b/...t-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java
@@ -9,6 +9,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ng-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApiDelegate.java b/...ng-pageable-delegatePattern/src/main/java/org/openapitools/api/VersioningApiDelegate.java
@@ -7,6 +7,7 @@
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;