diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache index 4a977b025f8..63fdf2c8534 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache @@ -52,7 +52,7 @@ public class {{classname}} { @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }) public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) { - return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/allParams}}securityContext); + return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/allParams}}securityContext); } {{/operation}} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache index 11b4036b832..f6161147700 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiException.mustache @@ -2,9 +2,9 @@ package {{apiPackage}}; {{>generatedAnnotation}} public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache index a1e5a678fe1..090fd8cb555 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiOriginFilter.mustache @@ -7,16 +7,16 @@ import javax.servlet.http.HttpServletResponse; {{>generatedAnnotation}} public class ApiOriginFilter implements javax.servlet.Filter { - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - public void destroy() {} + public void destroy() {} - public void init(FilterConfig filterConfig) throws ServletException {} -} \ No newline at end of file + public void init(FilterConfig filterConfig) throws ServletException {} +} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache index 2b9a2b1f8c5..f47a5350943 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/ApiResponseMessage.mustache @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement {{>generatedAnnotation}} public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; + + public ApiResponseMessage(){} + + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - @XmlTransient - public int getCode() { - return code; - } + @XmlTransient + public int getCode() { + return code; + } - public void setCode(int code) { - this.code = code; - } + public void setCode(int code) { + this.code = code; + } - public String getType() { - return type; - } + public String getType() { + return type; + } - public void setType(String type) { - this.type = type; - } + public void setType(String type) { + this.type = type; + } - public String getMessage() { - return message; - } + public String getMessage() { + return message; + } - public void setMessage(String message) { - this.message = message; - } + public void setMessage(String message) { + this.message = message; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache index 1bd5e207d7b..40c25c5ea5c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/NotFoundException.mustache @@ -2,9 +2,9 @@ package {{apiPackage}}; {{>generatedAnnotation}} public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/RestApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/RestApplication.mustache index b6ba3b369b1..82b8d9533e0 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/RestApplication.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/RestApplication.mustache @@ -5,5 +5,5 @@ import javax.ws.rs.core.Application; @ApplicationPath("/") public class RestApplication extends Application { - -} \ No newline at end of file + +} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/api.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/api.mustache index f7867d5b78f..5b8f44ca3e9 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/api.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/api.mustache @@ -38,7 +38,7 @@ public class {{classname}} { @ApiResponses(value = { {{#responses}} @ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},{{/hasMore}}{{/responses}} }) public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } {{/operation}} } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache index cb92ea54823..b44736af05f 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache @@ -12,9 +12,9 @@ org.apache.maven.plugins maven-war-plugin 2.6 - - false - + + false + maven-failsafe-plugin @@ -31,18 +31,18 @@ - - javax.ws.rs - javax.ws.rs-api - 2.0 - provided - - - io.swagger - swagger-annotations - provided - 1.5.3 - + + javax.ws.rs + javax.ws.rs-api + 2.0 + provided + + + io.swagger + swagger-annotations + provided + 1.5.3 + junit junit @@ -82,4 +82,4 @@ 4.8.1 - \ No newline at end of file + diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApi.java index 830049c297c..5e1c8a5eee7 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/PetApi.java @@ -48,7 +48,7 @@ public class PetApi { @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input", response = void.class) }) public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) { - return delegate.addPet(body, securityContext); + return delegate.addPet(body, securityContext); } @DELETE @@ -64,7 +64,7 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value", response = void.class) }) public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @PathParam("petId") Long petId, @ApiParam(value = "" )@HeaderParam("api_key") String apiKey) { - return delegate.deletePet(petId, apiKey, securityContext); + return delegate.deletePet(petId, apiKey, securityContext); } @GET @@ -81,7 +81,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete",required=true) @P @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") }) public Response findPetsByStatus( @NotNull @ApiParam(value = "Status values that need to be considered for filter",required=true, allowableValues="available, pending, sold") @QueryParam("status") List status) { - return delegate.findPetsByStatus(status, securityContext); + return delegate.findPetsByStatus(status, securityContext); } @GET @@ -98,7 +98,7 @@ public Response findPetsByStatus( @NotNull @ApiParam(value = "Status values that @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") }) public Response findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by",required=true) @QueryParam("tags") List tags) { - return delegate.findPetsByTags(tags, securityContext); + return delegate.findPetsByTags(tags, securityContext); } @GET @@ -113,7 +113,7 @@ public Response findPetsByTags( @NotNull @ApiParam(value = "Tags to filter by",r @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class), @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) }) public Response getPetById(@ApiParam(value = "ID of pet to return",required=true) @PathParam("petId") Long petId) { - return delegate.getPetById(petId, securityContext); + return delegate.getPetById(petId, securityContext); } @PUT @@ -131,7 +131,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return",required=true @ApiResponse(code = 404, message = "Pet not found", response = void.class), @ApiResponse(code = 405, message = "Validation exception", response = void.class) }) public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store" ,required=true) Pet body) { - return delegate.updatePet(body, securityContext); + return delegate.updatePet(body, securityContext); } @POST @@ -147,7 +147,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input", response = void.class) }) public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true) @PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) { - return delegate.updatePetWithForm(petId, name, status, securityContext); + return delegate.updatePetWithForm(petId, name, status, securityContext); } @POST @@ -163,6 +163,6 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file", required = false) InputStream fileInputStream, @Multipart(value = "file" , required = false) Attachment fileDetail) { - return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext); + return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext); } } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApi.java index 37aadc28199..8cf4d832171 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/StoreApi.java @@ -43,7 +43,7 @@ public class StoreApi { @ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class), @ApiResponse(code = 404, message = "Order not found", response = void.class) }) public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true) @PathParam("orderId") String orderId) { - return delegate.deleteOrder(orderId, securityContext); + return delegate.deleteOrder(orderId, securityContext); } @GET @@ -56,7 +56,7 @@ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") }) public Response getInventory() { - return delegate.getInventory(securityContext); + return delegate.getInventory(securityContext); } @GET @@ -69,7 +69,7 @@ public Response getInventory() { @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class), @ApiResponse(code = 404, message = "Order not found", response = Order.class) }) public Response getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that needs to be fetched",required=true) @PathParam("orderId") Long orderId) { - return delegate.getOrderById(orderId, securityContext); + return delegate.getOrderById(orderId, securityContext); } @POST @@ -81,6 +81,6 @@ public Response getOrderById( @Min(1) @Max(5)@ApiParam(value = "ID of pet that n @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) }) public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet" ,required=true) Order body) { - return delegate.placeOrder(body, securityContext); + return delegate.placeOrder(body, securityContext); } } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApi.java index c733612ed1a..bfbae3dad70 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/api/UserApi.java @@ -42,7 +42,7 @@ public class UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUser(@ApiParam(value = "Created user object" ,required=true) User body) { - return delegate.createUser(body, securityContext); + return delegate.createUser(body, securityContext); } @POST @@ -53,7 +53,7 @@ public Response createUser(@ApiParam(value = "Created user object" ,required=tru @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUsersWithArrayInput(@ApiParam(value = "List of user object" ,required=true) List body) { - return delegate.createUsersWithArrayInput(body, securityContext); + return delegate.createUsersWithArrayInput(body, securityContext); } @POST @@ -64,7 +64,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUsersWithListInput(@ApiParam(value = "List of user object" ,required=true) List body) { - return delegate.createUsersWithListInput(body, securityContext); + return delegate.createUsersWithListInput(body, securityContext); } @DELETE @@ -76,7 +76,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object" @ApiResponse(code = 400, message = "Invalid username supplied", response = void.class), @ApiResponse(code = 404, message = "User not found", response = void.class) }) public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true) @PathParam("username") String username) { - return delegate.deleteUser(username, securityContext); + return delegate.deleteUser(username, securityContext); } @GET @@ -89,7 +89,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted" @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class), @ApiResponse(code = 404, message = "User not found", response = User.class) }) public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true) @PathParam("username") String username) { - return delegate.getUserByName(username, securityContext); + return delegate.getUserByName(username, securityContext); } @GET @@ -101,7 +101,7 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) }) public Response loginUser( @NotNull @ApiParam(value = "The user name for login",required=true) @QueryParam("username") String username, @NotNull @ApiParam(value = "The password for login in clear text",required=true) @QueryParam("password") String password) { - return delegate.loginUser(username, password, securityContext); + return delegate.loginUser(username, password, securityContext); } @GET @@ -112,7 +112,7 @@ public Response loginUser( @NotNull @ApiParam(value = "The user name for login", @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response logoutUser() { - return delegate.logoutUser(securityContext); + return delegate.logoutUser(securityContext); } @PUT @@ -124,6 +124,6 @@ public Response logoutUser() { @ApiResponse(code = 400, message = "Invalid user supplied", response = void.class), @ApiResponse(code = 404, message = "User not found", response = void.class) }) public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true) @PathParam("username") String username, @ApiParam(value = "Updated user object" ,required=true) User body) { - return delegate.updateUser(username, body, securityContext); + return delegate.updateUser(username, body, securityContext); } } diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Category.java index 6359d8b0df5..92a3fc286e3 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Category.java @@ -29,7 +29,7 @@ public Category id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -46,7 +46,7 @@ public Category name(String name) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/ModelApiResponse.java index d8495139bb3..becb77ed19e 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -30,7 +30,7 @@ public ModelApiResponse code(Integer code) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -47,7 +47,7 @@ public ModelApiResponse type(String type) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -64,7 +64,7 @@ public ModelApiResponse message(String message) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Order.java index 1351a2a8fad..3c6e962bbd8 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Order.java @@ -66,7 +66,7 @@ public Order id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -83,7 +83,7 @@ public Order petId(Long petId) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -100,7 +100,7 @@ public Order quantity(Integer quantity) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -117,7 +117,7 @@ public Order shipDate(java.util.Date shipDate) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public java.util.Date getShipDate() { return shipDate; @@ -135,7 +135,7 @@ public Order status(StatusEnum status) { } - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -152,7 +152,7 @@ public Order complete(Boolean complete) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Pet.java index 284fc469e8e..c8868b563d0 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Pet.java @@ -70,7 +70,7 @@ public Pet id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -87,7 +87,7 @@ public Pet category(Category category) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -122,7 +122,7 @@ public Pet photoUrls(List photoUrls) { } - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { @@ -140,7 +140,7 @@ public Pet tags(List tags) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -158,7 +158,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; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Tag.java index 0efd1fee3f2..42f36861a08 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/Tag.java @@ -29,7 +29,7 @@ public Tag id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -46,7 +46,7 @@ public Tag name(String name) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/User.java index 935f0b642eb..e8cfc7d6b1d 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-cdi/src/gen/java/io/swagger/model/User.java @@ -35,7 +35,7 @@ public User id(Long id) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -52,7 +52,7 @@ public User username(String username) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -69,7 +69,7 @@ public User firstName(String firstName) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -86,7 +86,7 @@ public User lastName(String lastName) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -103,7 +103,7 @@ public User email(String email) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -120,7 +120,7 @@ public User password(String password) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -137,7 +137,7 @@ public User phone(String phone) { } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -155,7 +155,7 @@ public User userStatus(Integer userStatus) { } - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; diff --git a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json index df8ae51dbf4..18ccb05b4ba 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/swagger.json +++ b/samples/server/petstore/jaxrs-cxf-cdi/swagger.json @@ -108,8 +108,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java index b91184bbad3..cc48320d8cf 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java @@ -2,6 +2,7 @@ import java.math.BigDecimal; import io.swagger.model.Client; +import java.util.Date; import org.joda.time.LocalDate; import java.io.InputStream; @@ -42,7 +43,7 @@ public interface FakeApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid username supplied"), @ApiResponse(code = 404, message = "User not found") }) - public void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary", required = false) byte[] binary, @Multipart(value = "date", required = false) LocalDate date, @Multipart(value = "dateTime", required = false) javax.xml.datatype.XMLGregorianCalendar dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback); + public void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary", required = false) byte[] binary, @Multipart(value = "date", required = false) LocalDate date, @Multipart(value = "dateTime", required = false) Date dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback); @GET @Path("/fake") diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java index 4b12da15c8e..5588dddf74f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/UserApi.java @@ -91,6 +91,6 @@ public interface UserApi { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid user supplied"), @ApiResponse(code = 404, message = "User not found") }) - public void updateUser(@Valid @PathParam("username") String username, User body); + public void updateUser(@PathParam("username") String username, @Valid User body); } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index b19a90cbc3f..2a684fce3bd 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -16,9 +16,9 @@ public class AdditionalPropertiesClass { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Map mapProperty = new HashMap(); - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Map> mapOfMapProperty = new HashMap>(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java index 36c52fa27aa..7b8b9faa45e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java @@ -15,9 +15,9 @@ public class Animal { - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private String className = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String color = "red"; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 4d994a64f4c..cf72f92cd9e 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -16,7 +16,7 @@ public class ArrayOfArrayOfNumberOnly { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List> arrayArrayNumber = new ArrayList>(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index 45348bd5bab..6c1b6335d96 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -16,7 +16,7 @@ public class ArrayOfNumberOnly { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List arrayNumber = new ArrayList(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java index 48a352899b8..36523b49963 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java @@ -16,11 +16,11 @@ public class ArrayTest { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List arrayOfString = new ArrayList(); - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List> arrayArrayOfInteger = new ArrayList>(); - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List> arrayArrayOfModel = new ArrayList>(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java index 2dc50b68a86..8d25cc55cb3 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java @@ -13,17 +13,17 @@ public class Capitalization { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String smallCamel = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String capitalCamel = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String smallSnake = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String capitalSnake = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String scAETHFlowPoints = null; - @ApiModelProperty(example = "null", value = "Name of the pet ") + @ApiModelProperty(value = "Name of the pet ") private String ATT_NAME = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java index a44b4c3474e..6b05166cc2f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java @@ -14,7 +14,7 @@ public class Cat extends Animal { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Boolean declawed = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java index 206fb962639..6abf3c9c6cb 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java @@ -13,9 +13,9 @@ public class Category { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long id = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String name = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java index 522a5f5c835..9f4a079d27a 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java @@ -15,7 +15,7 @@ @ApiModel(description="Model for testing model with \"_class\" property") public class ClassModel { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String propertyClass = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java index effac40b532..c3eff86cc82 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java @@ -13,7 +13,7 @@ public class Client { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String client = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java index c33b9754f29..80aaf8dcfdd 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java @@ -14,7 +14,7 @@ public class Dog extends Animal { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String breed = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java index 1f72d296c0f..1a76571a267 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java @@ -48,7 +48,7 @@ public static JustSymbolEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private JustSymbolEnum justSymbol = null; @XmlType(name="ArrayEnumEnum") @@ -83,7 +83,7 @@ public static ArrayEnumEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List arrayEnum = new ArrayList(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java index 550742ed624..44199a514af 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java @@ -47,7 +47,7 @@ public static EnumStringEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private EnumStringEnum enumString = null; @XmlType(name="EnumIntegerEnum") @@ -82,7 +82,7 @@ public static EnumIntegerEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private EnumIntegerEnum enumInteger = null; @XmlType(name="EnumNumberEnum") @@ -117,9 +117,9 @@ public static EnumNumberEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private EnumNumberEnum enumNumber = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private OuterEnum outerEnum = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java index 1b8717f6ebc..cf49e7062ad 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java @@ -1,6 +1,7 @@ package io.swagger.model; import java.math.BigDecimal; +import java.util.Date; import java.util.UUID; import org.joda.time.LocalDate; import javax.validation.constraints.*; @@ -16,31 +17,31 @@ public class FormatTest { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer integer = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer int32 = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long int64 = null; - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private BigDecimal number = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Float _float = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Double _double = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String string = null; - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private byte[] _byte = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private byte[] binary = null; - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private LocalDate date = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar dateTime = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") + private Date dateTime = null; + @ApiModelProperty(value = "") private UUID uuid = null; - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private String password = null; /** @@ -230,15 +231,15 @@ public FormatTest date(LocalDate date) { * Get dateTime * @return dateTime **/ - public javax.xml.datatype.XMLGregorianCalendar getDateTime() { + public Date getDateTime() { return dateTime; } - public void setDateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { + public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public FormatTest dateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { + public FormatTest dateTime(Date dateTime) { this.dateTime = dateTime; return this; } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index e775fe7aab3..975088e5928 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -13,9 +13,9 @@ public class HasOnlyReadOnly { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String bar = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String foo = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java index f851274f064..896bfc54829 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java @@ -16,7 +16,7 @@ public class MapTest { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Map> mapMapOfString = new HashMap>(); @XmlType(name="InnerEnum") @@ -51,7 +51,7 @@ public static InnerEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Map mapOfEnumString = new HashMap(); /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index e22fda79803..51f18692f46 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -1,6 +1,7 @@ package io.swagger.model; import io.swagger.model.Animal; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,11 +19,11 @@ public class MixedPropertiesAndAdditionalPropertiesClass { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private UUID uuid = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar dateTime = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") + private Date dateTime = null; + @ApiModelProperty(value = "") private Map map = new HashMap(); /** @@ -46,15 +47,15 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get dateTime * @return dateTime **/ - public javax.xml.datatype.XMLGregorianCalendar getDateTime() { + public Date getDateTime() { return dateTime; } - public void setDateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { + public void setDateTime(Date dateTime) { this.dateTime = dateTime; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { this.dateTime = dateTime; return this; } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java index 5d7bf7f6a12..1f2a89db5d3 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java @@ -15,9 +15,9 @@ @ApiModel(description="Model for testing model name starting with number") public class Model200Response { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer name = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String propertyClass = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java index ddf2aa0b5a5..536fecd5949 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -13,11 +13,11 @@ public class ModelApiResponse { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer code = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String type = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String message = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java index f1fd55b763b..3a56f9c8683 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java @@ -15,7 +15,7 @@ @ApiModel(description="Model for testing reserved words") public class ModelReturn { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer _return = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java index 1365022268b..d5edcadd585 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java @@ -15,13 +15,13 @@ @ApiModel(description="Model for testing model name same as property name") public class Name { - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private Integer name = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer snakeCase = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String property = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer _123Number = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java index 203830ffd01..60e46381901 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java @@ -14,7 +14,7 @@ public class NumberOnly { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private BigDecimal justNumber = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java index 83e24c1ffe9..0333ed40bf1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java @@ -1,5 +1,6 @@ package io.swagger.model; +import java.util.Date; import javax.validation.constraints.*; import io.swagger.annotations.ApiModelProperty; @@ -13,14 +14,14 @@ public class Order { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long id = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long petId = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Integer quantity = null; - @ApiModelProperty(example = "null", value = "") - private javax.xml.datatype.XMLGregorianCalendar shipDate = null; + @ApiModelProperty(value = "") + private Date shipDate = null; @XmlType(name="StatusEnum") @XmlEnum(String.class) @@ -54,9 +55,9 @@ public static StatusEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") private StatusEnum status = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Boolean complete = false; /** @@ -114,15 +115,15 @@ public Order quantity(Integer quantity) { * Get shipDate * @return shipDate **/ - public javax.xml.datatype.XMLGregorianCalendar getShipDate() { + public Date getShipDate() { return shipDate; } - public void setShipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) { + public void setShipDate(Date shipDate) { this.shipDate = shipDate; } - public Order shipDate(javax.xml.datatype.XMLGregorianCalendar shipDate) { + public Order shipDate(Date shipDate) { this.shipDate = shipDate; return this; } diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java index 41c96154a4b..4d6215faf10 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java @@ -17,15 +17,15 @@ public class Pet { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long id = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Category category = null; @ApiModelProperty(example = "doggie", required = true, value = "") private String name = null; - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") private List photoUrls = new ArrayList(); - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private List tags = new ArrayList(); @XmlType(name="StatusEnum") @@ -60,7 +60,7 @@ public static StatusEnum fromValue(String v) { } } - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") private StatusEnum status = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 769ab0a7c48..f6868a7d344 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -13,9 +13,9 @@ public class ReadOnlyFirst { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String bar = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String baz = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java index a4b52b3bfe2..ebf181b8db6 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java @@ -13,7 +13,7 @@ public class SpecialModelName { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long specialPropertyName = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java index de1cd154399..40cf3188aa7 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java @@ -13,9 +13,9 @@ public class Tag { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long id = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String name = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java index 9c4b9d9ae7d..dd95f042ad1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java @@ -13,21 +13,21 @@ public class User { - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private Long id = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String username = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String firstName = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String lastName = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String email = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String password = null; - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") private String phone = null; - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") private Integer userStatus = null; /** diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java index 7c01649234e..cf469b71dd9 100644 --- a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java @@ -3,6 +3,7 @@ import io.swagger.api.*; import java.math.BigDecimal; import io.swagger.model.Client; +import java.util.Date; import org.joda.time.LocalDate; import java.io.InputStream; @@ -25,7 +26,7 @@ public Client testClientModel(Client body) { return null; } - public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, javax.xml.datatype.XMLGregorianCalendar dateTime, String password, String paramCallback) { + public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, Date dateTime, String password, String paramCallback) { // TODO: Implement... diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java index 7d926943bd2..20334be9858 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/FakeApiTest.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import io.swagger.model.Client; +import java.util.Date; import org.joda.time.LocalDate; import org.junit.Test; import org.junit.Before; @@ -108,7 +109,7 @@ public void testEndpointParametersTest() { String string = null; byte[] binary = null; LocalDate date = null; - javax.xml.datatype.XMLGregorianCalendar dateTime = null; + Date dateTime = null; String password = null; String paramCallback = null; //api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java index 444c595b78e..188fdb7b5cf 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/PetApiTest.java @@ -80,7 +80,7 @@ public void setup() { @Test public void addPetTest() { Pet body = null; - //api.addPet(body); + //api.addPet(body); // TODO: test validations @@ -99,7 +99,7 @@ public void addPetTest() { public void deletePetTest() { Long petId = null; String apiKey = null; - //api.deletePet(petId, apiKey); + //api.deletePet(petId, apiKey); // TODO: test validations @@ -153,7 +153,7 @@ public void findPetsByTagsTest() { @Test public void getPetByIdTest() { Long petId = null; - //Pet response = api.getPetById(petId); + //Pet response = api.getPetById(petId); //assertNotNull(response); // TODO: test validations @@ -171,7 +171,7 @@ public void getPetByIdTest() { @Test public void updatePetTest() { Pet body = null; - //api.updatePet(body); + //api.updatePet(body); // TODO: test validations @@ -191,7 +191,7 @@ public void updatePetWithFormTest() { Long petId = null; String name = null; String status = null; - //api.updatePetWithForm(petId, name, status); + //api.updatePetWithForm(petId, name, status); // TODO: test validations @@ -211,7 +211,7 @@ public void uploadFileTest() { Long petId = null; String additionalMetadata = null; org.apache.cxf.jaxrs.ext.multipart.Attachment file = null; - //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file); + //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file); //assertNotNull(response); // TODO: test validations diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java index c0cd10dca71..aa476b0cf0f 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/StoreApiTest.java @@ -79,7 +79,7 @@ public void setup() { @Test public void deleteOrderTest() { String orderId = null; - //api.deleteOrder(orderId); + //api.deleteOrder(orderId); // TODO: test validations @@ -114,7 +114,7 @@ public void getInventoryTest() { @Test public void getOrderByIdTest() { Long orderId = null; - //Order response = api.getOrderById(orderId); + //Order response = api.getOrderById(orderId); //assertNotNull(response); // TODO: test validations @@ -132,7 +132,7 @@ public void getOrderByIdTest() { @Test public void placeOrderTest() { Order body = null; - //Order response = api.placeOrder(body); + //Order response = api.placeOrder(body); //assertNotNull(response); // TODO: test validations diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java index 2d1481bde34..76bb7fa5578 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/io/swagger/api/UserApiTest.java @@ -79,7 +79,7 @@ public void setup() { @Test public void createUserTest() { User body = null; - //api.createUser(body); + //api.createUser(body); // TODO: test validations @@ -97,7 +97,7 @@ public void createUserTest() { @Test public void createUsersWithArrayInputTest() { List body = null; - //api.createUsersWithArrayInput(body); + //api.createUsersWithArrayInput(body); // TODO: test validations @@ -115,7 +115,7 @@ public void createUsersWithArrayInputTest() { @Test public void createUsersWithListInputTest() { List body = null; - //api.createUsersWithListInput(body); + //api.createUsersWithListInput(body); // TODO: test validations @@ -133,7 +133,7 @@ public void createUsersWithListInputTest() { @Test public void deleteUserTest() { String username = null; - //api.deleteUser(username); + //api.deleteUser(username); // TODO: test validations @@ -151,7 +151,7 @@ public void deleteUserTest() { @Test public void getUserByNameTest() { String username = null; - //User response = api.getUserByName(username); + //User response = api.getUserByName(username); //assertNotNull(response); // TODO: test validations @@ -170,7 +170,7 @@ public void getUserByNameTest() { public void loginUserTest() { String username = null; String password = null; - //String response = api.loginUser(username, password); + //String response = api.loginUser(username, password); //assertNotNull(response); // TODO: test validations @@ -187,7 +187,7 @@ public void loginUserTest() { */ @Test public void logoutUserTest() { - //api.logoutUser(); + //api.logoutUser(); // TODO: test validations @@ -206,7 +206,7 @@ public void logoutUserTest() { public void updateUserTest() { String username = null; User body = null; - //api.updateUser(username, body); + //api.updateUser(username, body); // TODO: test validations diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiException.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiOriginFilter.java index 2dc07362c92..f914bb6e892 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiOriginFilter.java @@ -7,16 +7,16 @@ public class ApiOriginFilter implements javax.servlet.Filter { - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - public void destroy() {} + public void destroy() {} - public void init(FilterConfig filterConfig) throws ServletException {} -} \ No newline at end of file + public void init(FilterConfig filterConfig) throws ServletException {} +} diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiResponseMessage.java index 33f95878e54..96a46422a55 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; + + public ApiResponseMessage(){} + + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - @XmlTransient - public int getCode() { - return code; - } + @XmlTransient + public int getCode() { + return code; + } - public void setCode(int code) { - this.code = code; - } + public void setCode(int code) { + this.code = code; + } - public String getType() { - return type; - } + public String getType() { + return type; + } - public void setType(String type) { - this.type = type; - } + public void setType(String type) { + this.type = type; + } - public String getMessage() { - return message; - } + public String getMessage() { + return message; + } - public void setMessage(String message) { - this.message = message; - } + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java index 6794ae0da5a..85fdecdc662 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java @@ -18,7 +18,7 @@ public class Category { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -30,7 +30,7 @@ public void setId(Long id) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java index 2de59f1191e..9a9ff0db8cd 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -19,7 +19,7 @@ public class ModelApiResponse { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("code") public Integer getCode() { return code; @@ -31,7 +31,7 @@ public void setCode(Integer code) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("type") public String getType() { return type; @@ -43,7 +43,7 @@ public void setType(String type) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("message") public String getMessage() { return message; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java index 4e9acd44a95..4ac001b7e98 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Order.java @@ -47,7 +47,7 @@ public String toString() { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -59,7 +59,7 @@ public void setId(Long id) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("petId") public Long getPetId() { return petId; @@ -71,7 +71,7 @@ public void setPetId(Long petId) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("quantity") public Integer getQuantity() { return quantity; @@ -83,7 +83,7 @@ public void setQuantity(Integer quantity) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("shipDate") public Date getShipDate() { return shipDate; @@ -96,7 +96,7 @@ public void setShipDate(Date shipDate) { * Order Status **/ - @ApiModelProperty(example = "null", value = "Order Status") + @ApiModelProperty(value = "Order Status") @JsonProperty("status") public StatusEnum getStatus() { return status; @@ -108,7 +108,7 @@ public void setStatus(StatusEnum status) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("complete") public Boolean getComplete() { return complete; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java index 81ea1ca0b24..4e48fb253b1 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Pet.java @@ -49,7 +49,7 @@ public String toString() { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -61,7 +61,7 @@ public void setId(Long id) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("category") public Category getCategory() { return category; @@ -86,7 +86,7 @@ public void setName(String name) { /** **/ - @ApiModelProperty(example = "null", required = true, value = "") + @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { @@ -99,7 +99,7 @@ public void setPhotoUrls(List photoUrls) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("tags") public List getTags() { return tags; @@ -112,7 +112,7 @@ public void setTags(List tags) { * pet status in the store **/ - @ApiModelProperty(example = "null", value = "pet status in the store") + @ApiModelProperty(value = "pet status in the store") @JsonProperty("status") public StatusEnum getStatus() { return status; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java index f6894199956..750e1a82b1e 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Tag.java @@ -18,7 +18,7 @@ public class Tag { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -30,7 +30,7 @@ public void setId(Long id) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("name") public String getName() { return name; diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java index 0c2be106305..a52524db22a 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/User.java @@ -24,7 +24,7 @@ public class User { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("id") public Long getId() { return id; @@ -36,7 +36,7 @@ public void setId(Long id) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("username") public String getUsername() { return username; @@ -48,7 +48,7 @@ public void setUsername(String username) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("firstName") public String getFirstName() { return firstName; @@ -60,7 +60,7 @@ public void setFirstName(String firstName) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("lastName") public String getLastName() { return lastName; @@ -72,7 +72,7 @@ public void setLastName(String lastName) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("email") public String getEmail() { return email; @@ -84,7 +84,7 @@ public void setEmail(String email) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("password") public String getPassword() { return password; @@ -96,7 +96,7 @@ public void setPassword(String password) { /** **/ - @ApiModelProperty(example = "null", value = "") + @ApiModelProperty(value = "") @JsonProperty("phone") public String getPhone() { return phone; @@ -109,7 +109,7 @@ public void setPhone(String phone) { * User Status **/ - @ApiModelProperty(example = "null", value = "User Status") + @ApiModelProperty(value = "User Status") @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java index 75ce8b03ee1..062df354b95 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/FakeApi.java @@ -30,7 +30,7 @@ public class FakeApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Client.class) }) public Response testClientModel(Client body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -44,7 +44,7 @@ public Response testClientModel(Client body) { @ApiResponse(code = 400, message = "Invalid username supplied", response = void.class), @ApiResponse(code = 404, message = "User not found", response = void.class) }) public Response testEndpointParameters(@FormParam(value = "number") BigDecimal number,@FormParam(value = "double") Double _double,@FormParam(value = "pattern_without_delimiter") String patternWithoutDelimiter,@FormParam(value = "byte") byte[] _byte,@FormParam(value = "integer") Integer integer,@FormParam(value = "int32") Integer int32,@FormParam(value = "int64") Long int64,@FormParam(value = "float") Float _float,@FormParam(value = "string") String string,@FormParam(value = "binary") byte[] binary,@FormParam(value = "date") LocalDate date,@FormParam(value = "dateTime") Date dateTime,@FormParam(value = "password") String password,@FormParam(value = "callback") String paramCallback) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -56,7 +56,7 @@ public Response testEndpointParameters(@FormParam(value = "number") BigDecimal @ApiResponse(code = 400, message = "Invalid request", response = void.class), @ApiResponse(code = 404, message = "Not found", response = void.class) }) public Response testEnumParameters(@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@HeaderParam("enum_header_string") String enumHeaderString,@QueryParam("enum_query_string_array") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@FormParam(value = "enum_query_double") Double enumQueryDouble) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/PetApi.java index f19581bb7e6..08ea2b34380 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/PetApi.java @@ -34,7 +34,7 @@ public class PetApi { @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input", response = void.class) }) public Response addPet(Pet body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @DELETE @@ -50,7 +50,7 @@ public Response addPet(Pet body) { @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value", response = void.class) }) public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long petId,@HeaderParam("api_key") String apiKey) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -67,7 +67,7 @@ public Response deletePet(@PathParam("petId") @ApiParam("Pet id to delete") Long @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid status value", response = Pet.class, responseContainer = "List") }) public Response findPetsByStatus(@QueryParam("status") @NotNull List status) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -84,7 +84,7 @@ public Response findPetsByStatus(@QueryParam("status") @NotNull List st @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), @ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") }) public Response findPetsByTags(@QueryParam("tags") @NotNull List tags) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -99,7 +99,7 @@ public Response findPetsByTags(@QueryParam("tags") @NotNull List tags) @ApiResponse(code = 400, message = "Invalid ID supplied", response = Pet.class), @ApiResponse(code = 404, message = "Pet not found", response = Pet.class) }) public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") Long petId) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @PUT @@ -117,7 +117,7 @@ public Response getPetById(@PathParam("petId") @ApiParam("ID of pet to return") @ApiResponse(code = 404, message = "Pet not found", response = void.class), @ApiResponse(code = 405, message = "Validation exception", response = void.class) }) public Response updatePet(Pet body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -133,7 +133,7 @@ public Response updatePet(Pet body) { @ApiResponses(value = { @ApiResponse(code = 405, message = "Invalid input", response = void.class) }) public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name") String name,@FormParam(value = "status") String status) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -150,7 +150,7 @@ public Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) }) public Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata") String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream, @FormParam(value = "file") Attachment fileDetail) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/StoreApi.java index 0b0522fad8e..153fd729be4 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/StoreApi.java @@ -29,7 +29,7 @@ public class StoreApi { @ApiResponse(code = 400, message = "Invalid ID supplied", response = void.class), @ApiResponse(code = 404, message = "Order not found", response = void.class) }) public Response deleteOrder(@PathParam("orderId") @ApiParam("ID of the order that needs to be deleted") String orderId) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -42,7 +42,7 @@ public Response deleteOrder(@PathParam("orderId") @ApiParam("ID of the order tha @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = Integer.class, responseContainer = "Map") }) public Response getInventory() { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -55,7 +55,7 @@ public Response getInventory() { @ApiResponse(code = 400, message = "Invalid ID supplied", response = Order.class), @ApiResponse(code = 404, message = "Order not found", response = Order.class) }) public Response getOrderById(@PathParam("orderId") @Min(1) @Max(5) @ApiParam("ID of pet that needs to be fetched") Long orderId) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -67,7 +67,7 @@ public Response getOrderById(@PathParam("orderId") @Min(1) @Max(5) @ApiParam("ID @ApiResponse(code = 200, message = "successful operation", response = Order.class), @ApiResponse(code = 400, message = "Invalid Order", response = Order.class) }) public Response placeOrder(Order body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/UserApi.java index 55a323774b8..bae63cd9903 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/UserApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/api/UserApi.java @@ -28,7 +28,7 @@ public class UserApi { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUser(User body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -39,7 +39,7 @@ public Response createUser(User body) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUsersWithArrayInput(List body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @POST @@ -50,7 +50,7 @@ public Response createUsersWithArrayInput(List body) { @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response createUsersWithListInput(List body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @DELETE @@ -62,7 +62,7 @@ public Response createUsersWithListInput(List body) { @ApiResponse(code = 400, message = "Invalid username supplied", response = void.class), @ApiResponse(code = 404, message = "User not found", response = void.class) }) public Response deleteUser(@PathParam("username") @ApiParam("The name that needs to be deleted") String username) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -75,7 +75,7 @@ public Response deleteUser(@PathParam("username") @ApiParam("The name that needs @ApiResponse(code = 400, message = "Invalid username supplied", response = User.class), @ApiResponse(code = 404, message = "User not found", response = User.class) }) public Response getUserByName(@PathParam("username") @ApiParam("The name that needs to be fetched. Use user1 for testing. ") String username) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -87,7 +87,7 @@ public Response getUserByName(@PathParam("username") @ApiParam("The name that ne @ApiResponse(code = 200, message = "successful operation", response = String.class), @ApiResponse(code = 400, message = "Invalid username/password supplied", response = String.class) }) public Response loginUser(@QueryParam("username") @NotNull String username,@QueryParam("password") @NotNull String password) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @GET @@ -98,7 +98,7 @@ public Response loginUser(@QueryParam("username") @NotNull String username,@Que @ApiResponses(value = { @ApiResponse(code = 200, message = "successful operation", response = void.class) }) public Response logoutUser() { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } @PUT @@ -110,7 +110,7 @@ public Response logoutUser() { @ApiResponse(code = 400, message = "Invalid user supplied", response = void.class), @ApiResponse(code = 404, message = "User not found", response = void.class) }) public Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,User body) { - return Response.ok().entity("magic!").build(); + return Response.ok().entity("magic!").build(); } } diff --git a/samples/server/petstore/jaxrs-spec/swagger.json b/samples/server/petstore/jaxrs-spec/swagger.json index d07f69d09ed..d08fa189b2f 100644 --- a/samples/server/petstore/jaxrs-spec/swagger.json +++ b/samples/server/petstore/jaxrs-spec/swagger.json @@ -727,8 +727,8 @@ }, "post" : { "tags" : [ "fake" ], - "summary" : "Fake endpoint for testing various parameters\n???\n?????????\n?? ?? ???\n", - "description" : "Fake endpoint for testing various parameters\n???\n?????????\n?? ?? ???\n", + "summary" : "Fake endpoint for testing various parameters\n假端點\n偽のエンドポイント\n가짜 엔드 포인트\n", + "description" : "Fake endpoint for testing various parameters\n假端點\n偽のエンドポイント\n가짜 엔드 포인트\n", "operationId" : "testEndpointParameters", "consumes" : [ "application/xml; charset=utf-8", "application/json; charset=utf-8" ], "produces" : [ "application/xml; charset=utf-8", "application/json; charset=utf-8" ],