Regenerate samples

samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java

@@ -52,8 +52,8 @@ public interface DefaultApi {
     )
 
     ResponseEntity<Void> get(
-        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @NotNull LocalDate date,
+        @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @RequestParam(value = "dateTime", defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @NotNull OffsetDateTime dateTime,
         @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate,
         @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
     );
@@ -82,8 +82,8 @@ ResponseEntity<Void> get(
     )
 
     ResponseEntity<Void> updatePetWithForm(
-        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
+        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) @NotNull LocalDate date,
+        @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
     );
 
 }

samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java

@@ -26,7 +26,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.9.0-SNAPSHOT")
 public class Pet {
 
-  private String atType = "Pet";
+  private @NotNull String atType = "Pet";
 
   private Integer age = 4;
 
@@ -60,10 +60,9 @@ public Pet atType(String atType) {
    * Get atType
    * @return atType
    */
-  @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("@type")
-  public String getAtType() {
+  public @NotNull String getAtType() {
     return atType;
   }
 
@@ -80,7 +79,6 @@ public Pet age(Integer age) {
    * Get age
    * @return age
    */
-
   @ApiModelProperty(value = "")
   @JsonProperty("age")
   public Integer getAge() {
@@ -100,7 +98,6 @@ public Pet happy(Boolean happy) {
    * Get happy
    * @return happy
    */
-
   @ApiModelProperty(value = "")
   @JsonProperty("happy")
   public Boolean getHappy() {
@@ -120,7 +117,6 @@ public Pet price(BigDecimal price) {
    * Get price
    * @return price
    */
-  @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("price")
   public BigDecimal getPrice() {
@@ -140,7 +136,6 @@ public Pet lastFeed(OffsetDateTime lastFeed) {
    * Get lastFeed
    * @return lastFeed
    */
-  @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("lastFeed")
   public OffsetDateTime getLastFeed() {
@@ -160,7 +155,6 @@ public Pet dateOfBirth(LocalDate dateOfBirth) {
    * Get dateOfBirth
    * @return dateOfBirth
    */
-  @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateOfBirth")
   public LocalDate getDateOfBirth() {
@@ -218,4 +212,3 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 }
-

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

@@ -64,7 +64,7 @@ public interface PetApi {
     )
 
     ResponseEntity<Void> addPet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @RequestBody @NotNull @Valid Pet pet
     );
 
 
@@ -94,7 +94,7 @@ ResponseEntity<Void> addPet(
     )
 
     ResponseEntity<Void> deletePet(
-        @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
+        @Parameter(name = "petId", description = "Pet id to delete", required = true, in = ParameterIn.PATH) @PathVariable("petId") @NotNull Long petId,
         @Parameter(name = "api_key", description = "", in = ParameterIn.HEADER) @RequestHeader(value = "api_key", required = false) String apiKey
     );
 
@@ -130,7 +130,7 @@ ResponseEntity<Void> deletePet(
     )
 
     ResponseEntity<List<Pet>> findPetsByStatus(
-        @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
+        @Parameter(name = "status", description = "Status values that need to be considered for filter", required = true, in = ParameterIn.QUERY) @RequestParam(value = "status") @NotNull List<String> status
     );
 
 
@@ -168,7 +168,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 = "tags", description = "Tags to filter by", required = true, in = ParameterIn.QUERY) @RequestParam(value = "tags") @NotNull List<String> tags
     );
 
 
@@ -205,7 +205,7 @@ ResponseEntity<List<Pet>> findPetsByTags(
     )
 
     ResponseEntity<Pet> getPetById(
-        @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated Long petId
+        @Parameter(name = "petId", deprecated = true, description = "ID of pet to return", required = true, in = ParameterIn.PATH) @PathVariable("petId") @Deprecated @NotNull Long petId
     );
 
 
@@ -239,7 +239,7 @@ ResponseEntity<Pet> getPetById(
     )
 
     ResponseEntity<Void> updatePet(
-        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet
+        @Parameter(name = "Pet", description = "Pet object that needs to be added to the store", required = true) @RequestBody @NotNull @Valid Pet pet
     );
 
 
@@ -271,9 +271,9 @@ ResponseEntity<Void> updatePet(
     )
 
     ResponseEntity<Void> updatePetWithForm(
-        @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-        @Parameter(name = "name", description = "Updated name of the pet") @Valid @RequestParam(value = "name", required = false) String name,
-        @Parameter(name = "status", description = "Updated status of the pet") @Valid @RequestParam(value = "status", required = false) String status
+        @Parameter(name = "petId", description = "ID of pet that needs to be updated", required = true, in = ParameterIn.PATH) @PathVariable("petId") @NotNull Long petId,
+        @Parameter(name = "name", description = "Updated name of the pet") @RequestParam(value = "name", required = false) String name,
+        @Parameter(name = "status", description = "Updated status of the pet") @RequestParam(value = "status", required = false) String status
     );
 
 
@@ -308,8 +308,8 @@ ResponseEntity<Void> updatePetWithForm(
     )
 
     ResponseEntity<ModelApiResponse> uploadFile(
-        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId,
-        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @Valid @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") @NotNull Long petId,
+        @Parameter(name = "additionalMetadata", description = "Additional data to pass to server") @RequestParam(value = "additionalMetadata", required = false) String additionalMetadata,
         @Parameter(name = "file", description = "file to upload") @RequestPart(value = "file", required = false) MultipartFile file
     );
 

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

@@ -62,7 +62,7 @@ public interface StoreApi {
     )
 
     ResponseEntity<Void> deleteOrder(
-        @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") String orderId
+        @Parameter(name = "orderId", description = "ID of the order that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("orderId") @NotNull String orderId
     );
 
 
@@ -127,7 +127,7 @@ ResponseEntity<Map<String, Integer>> getInventory(
     )
 
     ResponseEntity<Order> getOrderById(
-        @Min(1L) @Max(5L) @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") Long orderId
+        @Parameter(name = "orderId", description = "ID of pet that needs to be fetched", required = true, in = ParameterIn.PATH) @PathVariable("orderId") @NotNull @Min(1L) @Max(5L) Long orderId
     );
 
 
@@ -160,7 +160,7 @@ ResponseEntity<Order> getOrderById(
     )
 
     ResponseEntity<Order> placeOrder(
-        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order
+        @Parameter(name = "Order", description = "order placed for purchasing the pet", required = true) @RequestBody @NotNull @Valid Order order
     );
 
 }

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

@@ -64,7 +64,7 @@ public interface UserApi {
     )
 
     ResponseEntity<Void> createUser(
-        @Parameter(name = "User", description = "Created user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "User", description = "Created user object", required = true) @RequestBody @NotNull @Valid User user
     );
 
 
@@ -94,7 +94,7 @@ ResponseEntity<Void> createUser(
     )
 
     ResponseEntity<Void> createUsersWithArrayInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @RequestBody @NotNull List<@Valid User> user
     );
 
 
@@ -124,7 +124,7 @@ ResponseEntity<Void> createUsersWithArrayInput(
     )
 
     ResponseEntity<Void> createUsersWithListInput(
-        @Parameter(name = "User", description = "List of user object", required = true) @Valid @RequestBody List<@Valid User> user
+        @Parameter(name = "User", description = "List of user object", required = true) @RequestBody @NotNull List<@Valid User> user
     );
 
 
@@ -155,7 +155,7 @@ ResponseEntity<Void> createUsersWithListInput(
     )
 
     ResponseEntity<Void> deleteUser(
-        @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @Parameter(name = "username", description = "The name that needs to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") @NotNull String username
     );
 
 
@@ -189,7 +189,7 @@ ResponseEntity<Void> deleteUser(
     )
 
     ResponseEntity<User> getUserByName(
-        @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") String username
+        @Parameter(name = "username", description = "The name that needs to be fetched. Use user1 for testing.", required = true, in = ParameterIn.PATH) @PathVariable("username") @NotNull String username
     );
 
 
@@ -222,8 +222,8 @@ ResponseEntity<User> getUserByName(
     )
 
     ResponseEntity<String> loginUser(
-        @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "username", required = true) String username,
-        @NotNull @Parameter(name = "password", deprecated = true, description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "password", required = true) @Deprecated String password
+        @Parameter(name = "username", description = "The user name for login", required = true, in = ParameterIn.QUERY) @RequestParam(value = "username") @NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String username,
+        @Parameter(name = "password", deprecated = true, description = "The password for login in clear text", required = true, in = ParameterIn.QUERY) @RequestParam(value = "password") @Deprecated @NotNull String password
     );
 
 
@@ -284,8 +284,8 @@ ResponseEntity<Void> logoutUser(
     )
 
     ResponseEntity<Void> updateUser(
-        @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") String username,
-        @Parameter(name = "User", description = "Updated user object", required = true) @Valid @RequestBody User user
+        @Parameter(name = "username", description = "name that need to be deleted", required = true, in = ParameterIn.PATH) @PathVariable("username") @NotNull String username,
+        @Parameter(name = "User", description = "Updated user object", required = true) @RequestBody @NotNull @Valid User user
     );
 
 }

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java

@@ -24,7 +24,7 @@ public class Category {
 
   private Long id;
 
-  private String name;
+  private @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String name;
 
   public Category id(Long id) {
     this.id = id;
@@ -35,7 +35,6 @@ public Category id(Long id) {
    * Get id
    * @return id
    */
-
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   public Long getId() {
@@ -55,10 +54,9 @@ public Category name(String name) {
    * Get name
    * @return name
    */
-  @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
-  public String getName() {
+  public @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String getName() {
     return name;
   }
 
@@ -105,4 +103,3 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 }
-

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -39,7 +39,6 @@ public ModelApiResponse code(Integer code) {
    * Get code
    * @return code
    */
-
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
   public Integer getCode() {
@@ -59,7 +58,6 @@ public ModelApiResponse type(String type) {
    * Get type
    * @return type
    */
-
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
   public String getType() {
@@ -79,7 +77,6 @@ public ModelApiResponse message(String message) {
    * Get message
    * @return message
    */
-
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
   public String getMessage() {
@@ -131,4 +128,3 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 }
-

samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java

@@ -73,7 +73,7 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  private StatusEnum status;
+  private String status;
 
   private Boolean complete = false;
 
@@ -86,7 +86,6 @@ public Order id(Long id) {
    * Get id
    * @return id
    */
-
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   public Long getId() {
@@ -106,7 +105,6 @@ public Order petId(Long petId) {
    * Get petId
    * @return petId
    */
-
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
   public Long getPetId() {
@@ -126,7 +124,6 @@ public Order quantity(Integer quantity) {
    * Get quantity
    * @return quantity
    */
-
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
   public Integer getQuantity() {
@@ -146,7 +143,6 @@ public Order shipDate(OffsetDateTime shipDate) {
    * Get shipDate
    * @return shipDate
    */
-  @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
@@ -166,10 +162,9 @@ public Order status(StatusEnum status) {
    * Order Status
    * @return status
    */
-
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
-  public StatusEnum getStatus() {
+  public String getStatus() {
     return status;
   }
 
@@ -186,7 +181,6 @@ public Order complete(Boolean complete) {
    * Get complete
    * @return complete
    */
-
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
   public Boolean getComplete() {
@@ -244,4 +238,3 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 }
-