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

This commit is contained in:
Jeremie Bresson
2018-07-13 07:25:49 +02:00
261 changed files with 8800 additions and 5065 deletions

View File

@@ -152,6 +152,6 @@ public interface FakeApi {
produces = { "application/json" },
consumes = { "multipart/form-data" },
method = RequestMethod.POST)
ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata);
ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile requiredFile,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata);
}

View File

@@ -82,8 +82,8 @@ public class FakeApiController implements FakeApi {
return delegate.testJsonFormData(param, param2);
}
public ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata) {
return delegate.uploadFileWithRequiredFile(petId, file, additionalMetadata);
public ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile requiredFile,@ApiParam(value = "Additional data to pass to server", defaultValue="null") @RequestParam(value="additionalMetadata", required=false) String additionalMetadata) {
return delegate.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
}
}

View File

@@ -105,7 +105,7 @@ public interface FakeApiDelegate {
* @see FakeApi#uploadFileWithRequiredFile
*/
ResponseEntity<ModelApiResponse> uploadFileWithRequiredFile( Long petId,
MultipartFile file,
MultipartFile requiredFile,
String additionalMetadata);
}