Merge remote-tracking branch 'origin' into 2.3.0

This commit is contained in:
wing328 2017-03-20 15:07:43 +08:00
commit 08d4545947
3 changed files with 12 additions and 12 deletions

View File

@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} {{{dataType}}} {{paramName}}{{/isQueryParam}}

View File

@ -55,7 +55,7 @@ public class FakeApi {
@ApiResponses(value = {
@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<String> enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> enumQueryStringArray,@QueryParam("enum_query_string") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@FormParam(value = "enum_query_double") Double enumQueryDouble) {
public Response testEnumParameters(@FormParam(value = "enum_form_string_array") List<String> enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> 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();
}
}

View File

@ -108,8 +108,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ "available", "pending", "sold" ],
"default" : "available"
"default" : "available",
"enum" : [ "available", "pending", "sold" ]
},
"collectionFormat" : "csv"
} ],
@ -676,8 +676,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ ">", "$" ],
"default" : "$"
"default" : "$",
"enum" : [ ">", "$" ]
}
}, {
"name" : "enum_form_string",
@ -695,8 +695,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ ">", "$" ],
"default" : "$"
"default" : "$",
"enum" : [ ">", "$" ]
}
}, {
"name" : "enum_header_string",
@ -714,8 +714,8 @@
"type" : "array",
"items" : {
"type" : "string",
"enum" : [ ">", "$" ],
"default" : "$"
"default" : "$",
"enum" : [ ">", "$" ]
}
}, {
"name" : "enum_query_string",
@ -753,8 +753,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" ],