Skip to content

Commit 7c9a072

Browse files
committed
update samples
1 parent 54f2b70 commit 7c9a072

4 files changed

Lines changed: 7 additions & 12 deletions

File tree

  • samples
    • client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api
    • openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api
    • server/petstore
      • kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api
      • springboot-sort-validation/src/main/java/org/openapitools/api

samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/api/PetController.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ ResponseEntity<Void> deletePet(
125125
produces = { "application/json", "application/xml" }
126126
)
127127
ResponseEntity<List<Pet>> findPetsByStatus(
128-
@NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List<String> status,
129-
@ParameterObject final Pageable pageable
128+
@NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List<String> status
130129
);
131130

132131

@@ -164,8 +163,7 @@ ResponseEntity<List<Pet>> findPetsByStatus(
164163
produces = { "application/json", "application/xml" }
165164
)
166165
ResponseEntity<List<Pet>> findPetsByTags(
167-
@NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags,
168-
@ParameterObject final Pageable pageable
166+
@NotNull @Parameter(name = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "tags", required = true) List<String> tags
169167
);
170168

171169

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ ResponseEntity<Void> deletePet(
127127
@org.springframework.validation.annotation.Validated
128128
@org.springframework.security.access.prepost.PreAuthorize("hasRole('ADMIN')")
129129
ResponseEntity<List<Pet>> findPetsByStatus(
130-
@NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List<String> status,
131-
@ParameterObject final Pageable pageable
130+
@NotNull @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "status", required = true) List<String> status
132131
);
133132

134133

@@ -174,8 +173,7 @@ ResponseEntity<List<Pet>> findPetsByTags(
174173
@NotNull @Min(value = 1) @Parameter(name = "size", description = "The number of items to return per page. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = true, defaultValue = "20") Integer size2,
175174
@NotNull @Min(value = 0) @Parameter(name = "page", description = "The page to return, starting with page 0. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = true, defaultValue = "0") Integer page,
176175
@NotNull @Parameter(name = "sort", description = "The sorting to apply to the Pageable object. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = true, defaultValue = "id,asc") String sort,
177-
@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) @Nullable String size,
178-
@ParameterObject final Pageable pageable
176+
@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) @Nullable String size
179177
);
180178

181179

@@ -252,8 +250,7 @@ ResponseEntity<Pet> getPetById(
252250
ResponseEntity<List<Pet>> listAllPets(
253251
@Parameter(name = "page", description = "The page number to return. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
254252
@Parameter(name = "size", 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 = ParameterIn.QUERY) @Valid @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,
255-
@Parameter(name = "sort", description = "The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = false) @Nullable String sort,
256-
@ParameterObject final Pageable pageable
253+
@Parameter(name = "sort", description = "The sort order. Test QueryParam for issue #8315 - must be removed when x-spring-paginated:true is used.", in = ParameterIn.QUERY) @Valid @RequestParam(value = "sort", required = false) @Nullable String sort
257254
);
258255

259256

samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/api/PetApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ interface PetApi {
132132
value = [PATH_FIND_PETS_WITH_MIN_SIZE_CONSTRAINT_FROM_ALL_OF_REF],
133133
produces = ["application/json"]
134134
)
135-
fun findPetsWithMinSizeConstraintFromAllOfRef(@ValidPageable() pageable: Pageable): ResponseEntity<List<Pet>> {
135+
fun findPetsWithMinSizeConstraintFromAllOfRef(@ValidPageable(minSize = 5) pageable: Pageable): ResponseEntity<List<Pet>> {
136136
return ResponseEntity(HttpStatus.NOT_IMPLEMENTED)
137137
}
138138

samples/server/petstore/springboot-sort-validation/src/main/java/org/openapitools/api/PetApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ ResponseEntity<List<Pet>> findPetsWithExternalParamRefArraySort(
164164
produces = { "application/json" }
165165
)
166166
ResponseEntity<List<Pet>> findPetsWithMinSizeConstraintFromAllOfRef(
167-
@ValidPageable() final Pageable pageable
167+
@ValidPageable(minSize = 5) final Pageable pageable
168168
);
169169

170170

0 commit comments

Comments
 (0)