Skip to content

Commit 9ea852d

Browse files
authored
[JAVA] [Spring] Conditionally importing spring pageable (#8915)
* [JAVA][SPRING] Making spring pageable import optional * [JAVA][SPRING] Regenerating samples * [JAVA][SPRING] Regenerating samples again
1 parent d29d898 commit 9ea852d

174 files changed

Lines changed: 6 additions & 171 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

modules/openapi-generator/src/main/resources/JavaSpring/api.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import org.springframework.http.ResponseEntity;
2020
{{#useBeanValidation}}
2121
import org.springframework.validation.annotation.Validated;
2222
{{/useBeanValidation}}
23+
{{#vendorExtensions.x-spring-paginated}}
2324
import org.springframework.data.domain.Pageable;
25+
{{/vendorExtensions.x-spring-paginated}}
2426
import org.springframework.web.bind.annotation.*;
2527
{{#jdk8-no-delegate}}
2628
{{^reactive}}

modules/openapi-generator/src/main/resources/JavaSpring/apiController.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import org.springframework.web.context.request.NativeWebRequest;
2525
{{/isDelegate}}
2626
{{^jdk8}}
2727
import org.springframework.web.multipart.MultipartFile;
28+
{{#vendorExtensions.x-spring-paginated}}
2829
import org.springframework.data.domain.Pageable;
30+
{{/vendorExtensions.x-spring-paginated}}
2931
import springfox.documentation.annotations.ApiIgnore;
3032

3133
{{#useBeanValidation}}

modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ package {{package}};
33
{{#imports}}import {{import}};
44
{{/imports}}
55
import io.swagger.annotations.*;
6+
{{#vendorExtensions.x-spring-paginated}}
67
import org.springframework.data.domain.Pageable;
8+
{{/vendorExtensions.x-spring-paginated}}
79
{{#jdk8}}
810
import org.springframework.http.HttpStatus;
911
import org.springframework.http.MediaType;

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.http.MediaType;
1313
import org.springframework.http.ResponseEntity;
1414
import org.springframework.validation.annotation.Validated;
15-
import org.springframework.data.domain.Pageable;
1615
import org.springframework.web.bind.annotation.*;
1716
import org.springframework.web.context.request.NativeWebRequest;
1817
import org.springframework.web.multipart.MultipartFile;

0 commit comments

Comments
 (0)