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

This commit is contained in:
William Cheng
2018-11-15 17:49:44 +08:00
581 changed files with 32821 additions and 958 deletions

View File

@@ -149,8 +149,8 @@ public interface FakeApi {
@ApiResponse(code = 400, message = "Someting wrong") })
@RequestMapping(value = "/fake",
method = RequestMethod.DELETE)
default ResponseEntity<Void> testGroupParameters(@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) {
return getDelegate().testGroupParameters(stringGroup, booleanGroup, int64Group);
default ResponseEntity<Void> testGroupParameters(@NotNull @ApiParam(value = "Required String in group parameters", required = true) @Valid @RequestParam(value = "required_string_group", required = true) Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true) @RequestHeader(value="required_boolean_group", required=true) Boolean requiredBooleanGroup,@NotNull @ApiParam(value = "Required Integer in group parameters", required = true) @Valid @RequestParam(value = "required_int64_group", required = true) Long requiredInt64Group,@ApiParam(value = "String in group parameters") @Valid @RequestParam(value = "string_group", required = false) Integer stringGroup,@ApiParam(value = "Boolean in group parameters" ) @RequestHeader(value="boolean_group", required=false) Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @Valid @RequestParam(value = "int64_group", required = false) Long int64Group) {
return getDelegate().testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
}

View File

@@ -144,7 +144,10 @@ public interface FakeApiDelegate {
/**
* @see FakeApi#testGroupParameters
*/
default ResponseEntity<Void> testGroupParameters(Integer stringGroup,
default ResponseEntity<Void> testGroupParameters(Integer requiredStringGroup,
Boolean requiredBooleanGroup,
Long requiredInt64Group,
Integer stringGroup,
Boolean booleanGroup,
Long int64Group) {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);