Merge remote-tracking branch 'origin/master' into 3.4.x

2018-10-26 21:04:25 +08:00
parent a3dc5ecc20 6b41260755
commit 3482a0a993
757 changed files with 23913 additions and 2474 deletions
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -17,7 +17,7 @@ public class Category   {
  private Long id;

  @JsonProperty("name")
-  private String name;
+  private String name = "default-name";

  public Category id(Long id) {
    this.id = id;
@@ -48,7 +48,8 @@ public class Category   {
   * Get name
   * @return name
  **/
-  @ApiModelProperty(value = "")
+  @ApiModelProperty(required = true, value = "")
+  @NotNull


  public String getName() {