Properly implement samples, fixing build issues

Author: Lucy

docs/generators/java-camel.md

@@ -127,10 +127,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-class-extra-annotation|List of custom annotations to be added to model|MODEL|null
 |x-field-extra-annotation|List of custom annotations to be added to property|FIELD, OPERATION_PARAMETER|null
 |x-operation-extra-annotation|List of custom annotations to be added to operation|OPERATION|null
-|x-spring-paginated|Add org.springframework.data.domain.Pageable to controller method. Can be used to handle page & size query parameters|OPERATION|false
+|x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
-|x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 
 
 ## IMPORT MAPPING

docs/generators/spring.md

@@ -120,10 +120,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-class-extra-annotation|List of custom annotations to be added to model|MODEL|null
 |x-field-extra-annotation|List of custom annotations to be added to property|FIELD, OPERATION_PARAMETER|null
 |x-operation-extra-annotation|List of custom annotations to be added to operation|OPERATION|null
-|x-spring-paginated|Add org.springframework.data.domain.Pageable to controller method. Can be used to handle page & size query parameters|OPERATION|false
+|x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
-|x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 
 
 ## IMPORT MAPPING

modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml

@@ -171,6 +171,38 @@ paths:
           type: array
           items:
             type: string
+      - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
+          \ x-spring-paginated:true is used."
+        in: header
+        name: size
+        schema:
+          type: string
+      - description: "The number of items to return per page. Test QueryParam for\
+          \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: size
+        required: true
+        schema:
+          default: 20
+          minimum: 1
+          type: integer
+      - description: "The page to return, starting with page 0. Test QueryParam for\
+          \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: page
+        required: true
+        schema:
+          default: 0
+          minimum: 0
+          type: integer
+      - description: "The sorting to apply to the Pageable object. Test QueryParam\
+          \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: sort
+        required: true
+        schema:
+          default: "id,asc"
+          type: string
       responses:
         200:
           description: successful operation

modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml

@@ -136,6 +136,38 @@ paths:
           type: array
           items:
             type: string
+      - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
+          \ x-spring-paginated:true is used."
+        in: header
+        name: size
+        schema:
+          type: string
+      - description: "The number of items to return per page. Test QueryParam for\
+          \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: size
+        required: true
+        schema:
+          default: 20
+          minimum: 1
+          type: integer
+      - description: "The page to return, starting with page 0. Test QueryParam for\
+          \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: page
+        required: true
+        schema:
+          default: 0
+          minimum: 0
+          type: integer
+      - description: "The sorting to apply to the Pageable object. Test QueryParam\
+          \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        in: query
+        name: sort
+        required: true
+        schema:
+          default: "id,asc"
+          type: string
       responses:
         200:
           description: successful operation

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

@@ -169,7 +169,7 @@ ResponseEntity<List<Pet>> findPetsByStatus(
 
     ResponseEntity<List<Pet>> findPetsByTags(
         @NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags,
-        @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.") @RequestHeader(value = "size", required = false) String size,
+        @Parameter(name = "size", description = "A test HeaderParam for issue #8315 - must NOT be removed when x-spring-paginated:true is used.", in = ParameterIn.HEADER) @RequestHeader(value = "size", required = false) String size,
         @ParameterObject final Pageable pageable
     );
 

samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml

@@ -191,36 +191,45 @@ paths:
         style: form
       - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
           \ x-spring-paginated:true is used."
+        explode: false
         in: header
         name: size
+        required: false
         schema:
           type: string
+        style: simple
       - description: "The number of items to return per page. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: size
         required: true
         schema:
           default: 20
           minimum: 1
           type: integer
+        style: form
       - description: "The page to return, starting with page 0. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: page
         required: true
         schema:
           default: 0
           minimum: 0
           type: integer
+        style: form
       - description: "The sorting to apply to the Pageable object. Test QueryParam\
           \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: sort
         required: true
         schema:
           default: "id,asc"
           type: string
+        style: form
       responses:
         "200":
           content:

samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml

@@ -191,36 +191,45 @@ paths:
         style: form
       - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
           \ x-spring-paginated:true is used."
+        explode: false
         in: header
         name: size
+        required: false
         schema:
           type: string
+        style: simple
       - description: "The number of items to return per page. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: size
         required: true
         schema:
           default: 20
           minimum: 1
           type: integer
+        style: form
       - description: "The page to return, starting with page 0. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: page
         required: true
         schema:
           default: 0
           minimum: 0
           type: integer
+        style: form
       - description: "The sorting to apply to the Pageable object. Test QueryParam\
           \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: sort
         required: true
         schema:
           default: "id,asc"
           type: string
+        style: form
       responses:
         "200":
           content:

samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml

@@ -191,36 +191,45 @@ paths:
         style: form
       - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
           \ x-spring-paginated:true is used."
+        explode: false
         in: header
         name: size
+        required: false
         schema:
           type: string
+        style: simple
       - description: "The number of items to return per page. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: size
         required: true
         schema:
           default: 20
           minimum: 1
           type: integer
+        style: form
       - description: "The page to return, starting with page 0. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: page
         required: true
         schema:
           default: 0
           minimum: 0
           type: integer
+        style: form
       - description: "The sorting to apply to the Pageable object. Test QueryParam\
           \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: sort
         required: true
         schema:
           default: "id,asc"
           type: string
+        style: form
       responses:
         "200":
           content:

samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml

@@ -191,36 +191,45 @@ paths:
         style: form
       - description: "A test HeaderParam for issue #8315 - must NOT be removed when\
           \ x-spring-paginated:true is used."
+        explode: false
         in: header
         name: size
+        required: false
         schema:
           type: string
+        style: simple
       - description: "The number of items to return per page. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: size
         required: true
         schema:
           default: 20
           minimum: 1
           type: integer
+        style: form
       - description: "The page to return, starting with page 0. Test QueryParam for\
           \ issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: page
         required: true
         schema:
           default: 0
           minimum: 0
           type: integer
+        style: form
       - description: "The sorting to apply to the Pageable object. Test QueryParam\
           \ for issue #8315 - must be removed when x-spring-paginated:true is used."
+        explode: true
         in: query
         name: sort
         required: true
         schema:
           default: "id,asc"
           type: string
+        style: form
       responses:
         "200":
           content: