From 70801cfc47d1bb74a964490692261138bfc97161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Sun, 26 Mar 2017 17:17:38 +0200 Subject: [PATCH] Update samples for Undertow. --- .../main/java/io/swagger/model/Category.java | 10 ++++----- .../io/swagger/model/ModelApiResponse.java | 12 +++++----- .../src/main/java/io/swagger/model/Order.java | 18 +++++++-------- .../src/main/java/io/swagger/model/Pet.java | 16 +++++++------- .../src/main/java/io/swagger/model/Tag.java | 10 ++++----- .../src/main/java/io/swagger/model/User.java | 22 +++++++++---------- .../src/main/resources/config/swagger.json | 21 +++++++++--------- 7 files changed, 54 insertions(+), 55 deletions(-) diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java index 37752be9217..341e23cb309 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Category.java @@ -13,7 +13,7 @@ **/ @ApiModel(description = "A category for a pet") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Category { private Long id = null; @@ -27,7 +27,7 @@ public Category id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -44,7 +44,7 @@ public Category name(String name) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; @@ -55,7 +55,7 @@ public void setName(String name) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -87,7 +87,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java index 11bbcebb0d9..3f6d6c8ecec 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/ModelApiResponse.java @@ -13,7 +13,7 @@ **/ @ApiModel(description = "Describes the result of uploading an image resource") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class ModelApiResponse { private Integer code = null; @@ -28,7 +28,7 @@ public ModelApiResponse code(Integer code) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -45,7 +45,7 @@ public ModelApiResponse type(String type) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -62,7 +62,7 @@ public ModelApiResponse message(String message) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; @@ -73,7 +73,7 @@ public void setMessage(String message) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -107,7 +107,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java index 7297000023f..a2b2be8428e 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Order.java @@ -15,7 +15,7 @@ **/ @ApiModel(description = "An order for a pets from the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Order { private Long id = null; @@ -53,7 +53,7 @@ public Order id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -70,7 +70,7 @@ public Order petId(Long petId) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -87,7 +87,7 @@ public Order quantity(Integer quantity) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -104,7 +104,7 @@ public Order shipDate(Date shipDate) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { return shipDate; @@ -122,7 +122,7 @@ public Order status(StatusEnum status) { } - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -139,7 +139,7 @@ public Order complete(Boolean complete) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; @@ -150,7 +150,7 @@ public void setComplete(Boolean complete) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -190,7 +190,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java index 6b2e4693ea9..9c435b2f98f 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Pet.java @@ -18,7 +18,7 @@ **/ @ApiModel(description = "A pet for sale in the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Pet { private Long id = null; @@ -56,7 +56,7 @@ public Pet id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -73,7 +73,7 @@ public Pet category(Category category) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -107,7 +107,7 @@ public Pet photoUrls(List photoUrls) { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") public List getPhotoUrls() { return photoUrls; @@ -124,7 +124,7 @@ public Pet tags(List tags) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -142,7 +142,7 @@ public Pet status(StatusEnum status) { } - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -153,7 +153,7 @@ public void setStatus(StatusEnum status) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -193,7 +193,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java index b713c9d3f9d..d4af38b6aa4 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/Tag.java @@ -13,7 +13,7 @@ **/ @ApiModel(description = "A tag for a pet") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class Tag { private Long id = null; @@ -27,7 +27,7 @@ public Tag id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -44,7 +44,7 @@ public Tag name(String name) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; @@ -55,7 +55,7 @@ public void setName(String name) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -87,7 +87,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java b/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java index a543df663cf..f83a7ff0265 100644 --- a/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java +++ b/samples/server/petstore/undertow/src/main/java/io/swagger/model/User.java @@ -13,7 +13,7 @@ **/ @ApiModel(description = "A User who is purchasing from the pet store") -@javax.annotation.Generated(value = "class io.swagger.codegen.languages.UndertowCodegen", date = "2016-10-19T16:19:58.109+08:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.UndertowCodegen", date = "2017-03-26T17:33:39.915+02:00") public class User { private Long id = null; @@ -33,7 +33,7 @@ public User id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -50,7 +50,7 @@ public User username(String username) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -67,7 +67,7 @@ public User firstName(String firstName) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -84,7 +84,7 @@ public User lastName(String lastName) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -101,7 +101,7 @@ public User email(String email) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -118,7 +118,7 @@ public User password(String password) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -135,7 +135,7 @@ public User phone(String phone) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -153,7 +153,7 @@ public User userStatus(Integer userStatus) { } - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; @@ -164,7 +164,7 @@ public void setUserStatus(Integer userStatus) { @Override - public boolean equals(Object o) { + public boolean equals(java.lang.Object o) { if (this == o) { return true; } @@ -208,7 +208,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(java.lang.Object o) { if (o == null) { return "null"; } diff --git a/samples/server/petstore/undertow/src/main/resources/config/swagger.json b/samples/server/petstore/undertow/src/main/resources/config/swagger.json index a7b2b1871e6..3446ff8eac8 100644 --- a/samples/server/petstore/undertow/src/main/resources/config/swagger.json +++ b/samples/server/petstore/undertow/src/main/resources/config/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -395,8 +395,8 @@ "description" : "ID of pet that needs to be fetched", "required" : true, "type" : "integer", - "maximum" : 5.0, - "minimum" : 1.0, + "maximum" : 5, + "minimum" : 1, "format" : "int64" } ], "responses" : { @@ -427,8 +427,7 @@ "in" : "path", "description" : "ID of the order that needs to be deleted", "required" : true, - "type" : "string", - "minimum" : 1.0 + "type" : "string" } ], "responses" : { "400" : { @@ -677,11 +676,6 @@ } }, "securityDefinitions" : { - "api_key" : { - "type" : "apiKey", - "name" : "api_key", - "in" : "header" - }, "petstore_auth" : { "type" : "oauth2", "authorizationUrl" : "http://petstore.swagger.io/api/oauth/dialog", @@ -690,6 +684,11 @@ "write:pets" : "modify pets in your account", "read:pets" : "read your pets" } + }, + "api_key" : { + "type" : "apiKey", + "name" : "api_key", + "in" : "header" } }, "definitions" : {