Skip to content

Commit 460d153

Browse files
wing328wing328
committed
add tests for option
1 parent 3346fd0 commit 460d153

7 files changed

Lines changed: 37 additions & 36 deletions

File tree

‎bin/configs/spring-boot-x-implements-skip.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ outputDir: samples/server/petstore/springboot-x-implements-skip
33
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-x-implements.yaml
44
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
55
additionalProperties:
6+
additionalNotNullAnnotations: true
67
documentationProvider: springfox
78
artifactId: springboot
89
snapshotVersion: "true"

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/AnotherFakeApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ default Optional<NativeWebRequest> getRequest() {
5656
consumes = { "application/json" }
5757
)
5858
default ResponseEntity<ClientDto> call123testSpecialTags(
59-
@ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto
59+
@ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto
6060
) {
6161
getRequest().ifPresent(request -> {
6262
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ default ResponseEntity<HealthCheckResultDto> fakeHealthGet(
152152
consumes = { "application/json", "application/xml" }
153153
)
154154
default ResponseEntity<Void> fakeHttpSignatureTest(
155-
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto,
155+
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto,
156156
@ApiParam(value = "query parameter") @Valid @RequestParam(value = "query_1", required = false) @Nullable String query1,
157157
@ApiParam(value = "header parameter") @RequestHeader(value = "header_1", required = false) @Nullable String header1
158158
) {
@@ -323,7 +323,7 @@ default ResponseEntity<String> fakeOuterStringSerialize(
323323
consumes = { "application/json" }
324324
)
325325
default ResponseEntity<OuterObjectWithEnumPropertyDto> fakePropertyEnumIntegerSerialize(
326-
@ApiParam(value = "Input enum (int) as post body", required = true) @Valid @RequestBody OuterObjectWithEnumPropertyDto outerObjectWithEnumPropertyDto
326+
@ApiParam(value = "Input enum (int) as post body", required = true) @NotNull @Valid @RequestBody OuterObjectWithEnumPropertyDto outerObjectWithEnumPropertyDto
327327
) {
328328
getRequest().ifPresent(request -> {
329329
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -362,7 +362,7 @@ default ResponseEntity<OuterObjectWithEnumPropertyDto> fakePropertyEnumIntegerSe
362362
consumes = { "application/json" }
363363
)
364364
default ResponseEntity<Void> testAdditionalPropertiesReference(
365-
@ApiParam(value = "request body", required = true) @Valid @RequestBody Map<String, Object> requestBody
365+
@ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map<String, Object> requestBody
366366
) {
367367
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
368368

@@ -392,7 +392,7 @@ default ResponseEntity<Void> testAdditionalPropertiesReference(
392392
consumes = { "image/png" }
393393
)
394394
default ResponseEntity<Void> testBodyWithBinary(
395-
@ApiParam(value = "image to upload", required = true) @Valid @RequestBody org.springframework.core.io.Resource body
395+
@ApiParam(value = "image to upload", required = true) @NotNull @Valid @RequestBody org.springframework.core.io.Resource body
396396
) {
397397
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
398398

@@ -422,7 +422,7 @@ default ResponseEntity<Void> testBodyWithBinary(
422422
consumes = { "application/json" }
423423
)
424424
default ResponseEntity<Void> testBodyWithFileSchema(
425-
@ApiParam(value = "", required = true) @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto
425+
@ApiParam(value = "", required = true) @NotNull @Valid @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto
426426
) {
427427
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
428428

@@ -453,7 +453,7 @@ default ResponseEntity<Void> testBodyWithFileSchema(
453453
)
454454
default ResponseEntity<Void> testBodyWithQueryParams(
455455
@NotNull @ApiParam(value = "", required = true) @Valid @RequestParam(value = "query", required = true) String query,
456-
@ApiParam(value = "", required = true) @Valid @RequestBody UserDto userDto
456+
@ApiParam(value = "", required = true) @NotNull @Valid @RequestBody UserDto userDto
457457
) {
458458
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
459459

@@ -485,7 +485,7 @@ default ResponseEntity<Void> testBodyWithQueryParams(
485485
consumes = { "application/json" }
486486
)
487487
default ResponseEntity<ClientDto> testClientModel(
488-
@ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto
488+
@ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto
489489
) {
490490
getRequest().ifPresent(request -> {
491491
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -542,10 +542,10 @@ default ResponseEntity<ClientDto> testClientModel(
542542
consumes = { "application/x-www-form-urlencoded" }
543543
)
544544
default ResponseEntity<Void> testEndpointParameters(
545-
@ApiParam(value = "None", required = true) @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number,
546-
@ApiParam(value = "None", required = true) @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double,
547-
@ApiParam(value = "None", required = true) @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
548-
@ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
545+
@ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "32.1") @DecimalMax(value = "543.2") @Valid @RequestParam(value = "number", required = true) BigDecimal number,
546+
@ApiParam(value = "None", required = true) @NotNull @DecimalMin(value = "67.8") @DecimalMax(value = "123.4") @Valid @RequestParam(value = "double", required = true) Double _double,
547+
@ApiParam(value = "None", required = true) @NotNull @Pattern(regexp = "^[A-Z].*") @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
548+
@ApiParam(value = "None", required = true) @NotNull @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
549549
@ApiParam(value = "None") @Min(value = 10) @Max(value = 100) @Valid @RequestParam(value = "integer", required = false) Integer integer,
550550
@ApiParam(value = "None") @Min(value = 20) @Max(value = 200) @Valid @RequestParam(value = "int32", required = false) Integer int32,
551551
@ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
@@ -675,7 +675,7 @@ default ResponseEntity<Void> testGroupParameters(
675675
consumes = { "application/json" }
676676
)
677677
default ResponseEntity<Void> testInlineAdditionalProperties(
678-
@ApiParam(value = "request body", required = true) @Valid @RequestBody Map<String, String> requestBody
678+
@ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map<String, String> requestBody
679679
) {
680680
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
681681

@@ -705,7 +705,7 @@ default ResponseEntity<Void> testInlineAdditionalProperties(
705705
consumes = { "application/json" }
706706
)
707707
default ResponseEntity<Void> testInlineFreeformAdditionalProperties(
708-
@ApiParam(value = "request body", required = true) @Valid @RequestBody TestInlineFreeformAdditionalPropertiesRequestDto testInlineFreeformAdditionalPropertiesRequestDto
708+
@ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody TestInlineFreeformAdditionalPropertiesRequestDto testInlineFreeformAdditionalPropertiesRequestDto
709709
) {
710710
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
711711

@@ -736,8 +736,8 @@ default ResponseEntity<Void> testInlineFreeformAdditionalProperties(
736736
consumes = { "application/x-www-form-urlencoded" }
737737
)
738738
default ResponseEntity<Void> testJsonFormData(
739-
@ApiParam(value = "field1", required = true) @Valid @RequestParam(value = "param", required = true) String param,
740-
@ApiParam(value = "field2", required = true) @Valid @RequestParam(value = "param2", required = true) String param2
739+
@ApiParam(value = "field1", required = true) @NotNull @Valid @RequestParam(value = "param", required = true) String param,
740+
@ApiParam(value = "field2", required = true) @NotNull @Valid @RequestParam(value = "param2", required = true) String param2
741741
) {
742742
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
743743

@@ -767,7 +767,7 @@ default ResponseEntity<Void> testJsonFormData(
767767
consumes = { "application/json" }
768768
)
769769
default ResponseEntity<Void> testNullable(
770-
@ApiParam(value = "request body", required = true) @Valid @RequestBody ChildWithNullableDto childWithNullableDto
770+
@ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody ChildWithNullableDto childWithNullableDto
771771
) {
772772
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
773773

@@ -838,7 +838,7 @@ default ResponseEntity<Void> testQueryParameterCollectionFormat(
838838
consumes = { "application/json" }
839839
)
840840
default ResponseEntity<Void> testStringMapReference(
841-
@ApiParam(value = "request body", required = true) @Valid @RequestBody Map<String, String> requestBody
841+
@ApiParam(value = "request body", required = true) @NotNull @Valid @RequestBody Map<String, String> requestBody
842842
) {
843843
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
844844

@@ -878,7 +878,7 @@ default ResponseEntity<Void> testStringMapReference(
878878
consumes = { "multipart/form-data" }
879879
)
880880
default ResponseEntity<ApiResponseDto> uploadFileWithRequiredFile(
881-
@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
881+
@NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
882882
@ApiParam(value = "file to upload", required = true) @RequestPart(value = "requiredFile", required = true) MultipartFile requiredFile,
883883
@ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata
884884
) {

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeClassnameTestApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ default Optional<NativeWebRequest> getRequest() {
5959
consumes = { "application/json" }
6060
)
6161
default ResponseEntity<ClientDto> testClassname(
62-
@ApiParam(value = "client model", required = true) @Valid @RequestBody ClientDto clientDto
62+
@ApiParam(value = "client model", required = true) @NotNull @Valid @RequestBody ClientDto clientDto
6363
) {
6464
getRequest().ifPresent(request -> {
6565
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ default Optional<NativeWebRequest> getRequest() {
6565
consumes = { "application/json", "application/xml" }
6666
)
6767
default ResponseEntity<Void> addPet(
68-
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto
68+
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto
6969
) {
7070
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
7171

@@ -103,7 +103,7 @@ default ResponseEntity<Void> addPet(
103103
value = PetApi.PATH_DELETE_PET
104104
)
105105
default ResponseEntity<Void> deletePet(
106-
@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
106+
@NotNull @ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,
107107
@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) @Nullable String apiKey
108108
) {
109109
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
@@ -252,7 +252,7 @@ default ResponseEntity<Set<PetDto>> findPetsByTags(
252252
produces = { "application/xml", "application/json" }
253253
)
254254
default ResponseEntity<PetDto> getPetById(
255-
@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId
255+
@NotNull @ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId
256256
) {
257257
getRequest().ifPresent(request -> {
258258
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -308,7 +308,7 @@ default ResponseEntity<PetDto> getPetById(
308308
consumes = { "application/json", "application/xml" }
309309
)
310310
default ResponseEntity<Void> updatePet(
311-
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody PetDto petDto
311+
@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid @RequestBody PetDto petDto
312312
) {
313313
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
314314

@@ -348,7 +348,7 @@ default ResponseEntity<Void> updatePet(
348348
consumes = { "application/x-www-form-urlencoded" }
349349
)
350350
default ResponseEntity<Void> updatePetWithForm(
351-
@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,
351+
@NotNull @ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,
352352
@ApiParam(value = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
353353
@ApiParam(value = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
354354
) {
@@ -390,7 +390,7 @@ default ResponseEntity<Void> updatePetWithForm(
390390
consumes = { "multipart/form-data" }
391391
)
392392
default ResponseEntity<ApiResponseDto> uploadFile(
393-
@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
393+
@NotNull @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
394394
@ApiParam(value = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
395395
@ApiParam(value = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
396396
) {

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ default Optional<NativeWebRequest> getRequest() {
5656
value = StoreApi.PATH_DELETE_ORDER
5757
)
5858
default ResponseEntity<Void> deleteOrder(
59-
@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId
59+
@NotNull @ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("order_id") String orderId
6060
) {
6161
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
6262

@@ -125,7 +125,7 @@ default ResponseEntity<Map<String, Integer>> getInventory(
125125
produces = { "application/xml", "application/json" }
126126
)
127127
default ResponseEntity<OrderDto> getOrderById(
128-
@Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId
128+
@NotNull @Min(value = 1L) @Max(value = 5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("order_id") Long orderId
129129
) {
130130
getRequest().ifPresent(request -> {
131131
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -173,7 +173,7 @@ default ResponseEntity<OrderDto> getOrderById(
173173
consumes = { "application/json" }
174174
)
175175
default ResponseEntity<OrderDto> placeOrder(
176-
@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody OrderDto orderDto
176+
@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid @RequestBody OrderDto orderDto
177177
) {
178178
getRequest().ifPresent(request -> {
179179
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {

‎samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ default Optional<NativeWebRequest> getRequest() {
5555
consumes = { "application/json" }
5656
)
5757
default ResponseEntity<Void> createUser(
58-
@ApiParam(value = "Created user object", required = true) @Valid @RequestBody UserDto userDto
58+
@ApiParam(value = "Created user object", required = true) @NotNull @Valid @RequestBody UserDto userDto
5959
) {
6060
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
6161

@@ -85,7 +85,7 @@ default ResponseEntity<Void> createUser(
8585
consumes = { "application/json" }
8686
)
8787
default ResponseEntity<Void> createUsersWithArrayInput(
88-
@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto
88+
@ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto
8989
) {
9090
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
9191

@@ -115,7 +115,7 @@ default ResponseEntity<Void> createUsersWithArrayInput(
115115
consumes = { "application/json" }
116116
)
117117
default ResponseEntity<Void> createUsersWithListInput(
118-
@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<@Valid UserDto> userDto
118+
@ApiParam(value = "List of user object", required = true) @NotNull @Valid @RequestBody List<@Valid UserDto> userDto
119119
) {
120120
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
121121

@@ -146,7 +146,7 @@ default ResponseEntity<Void> createUsersWithListInput(
146146
value = UserApi.PATH_DELETE_USER
147147
)
148148
default ResponseEntity<Void> deleteUser(
149-
@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username
149+
@NotNull @ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username
150150
) {
151151
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
152152

@@ -181,7 +181,7 @@ default ResponseEntity<Void> deleteUser(
181181
produces = { "application/xml", "application/json" }
182182
)
183183
default ResponseEntity<UserDto> getUserByName(
184-
@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username
184+
@NotNull @ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username
185185
) {
186186
getRequest().ifPresent(request -> {
187187
for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
@@ -291,8 +291,8 @@ default ResponseEntity<Void> logoutUser(
291291
consumes = { "application/json" }
292292
)
293293
default ResponseEntity<Void> updateUser(
294-
@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
295-
@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody UserDto userDto
294+
@NotNull @ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,
295+
@ApiParam(value = "Updated user object", required = true) @NotNull @Valid @RequestBody UserDto userDto
296296
) {
297297
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
298298

0 commit comments

Comments
 (0)