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

This commit is contained in:
William Cheng
2022-01-30 18:01:35 +08:00
4543 changed files with 127729 additions and 45908 deletions

View File

@@ -137,9 +137,9 @@ public class PetApiController extends Controller {
} else {
additionalMetadata = null;
}
Http.MultipartFormData<TemporaryFile> bodyfile = request.body().asMultipartFormData();
Http.MultipartFormData.FilePart<TemporaryFile> file = bodyfile.getFile("file");
return imp.uploadFileHttp(request, petId, additionalMetadata, file);
Http.MultipartFormData<TemporaryFile> body_file = request.body().asMultipartFormData();
Http.MultipartFormData.FilePart<TemporaryFile> _file = body_file.getFile("file");
return imp.uploadFileHttp(request, petId, additionalMetadata, _file);
}
}

View File

@@ -52,7 +52,7 @@ public class PetApiControllerImp extends PetApiControllerImpInterface {
}
@Override
public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> file) throws Exception {
public ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> _file) throws Exception {
//Do your magic!!!
return new ModelApiResponse();
}

View File

@@ -112,18 +112,18 @@ public abstract class PetApiControllerImpInterface {
public abstract void updatePetWithForm(Http.Request request, Long petId, String name, String status) throws Exception;
public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> file) throws Exception {
public Result uploadFileHttp(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> _file) throws Exception {
if (!securityAPIUtils.isRequestTokenValid(request, "petstore_auth")) {
return unauthorized();
}
ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, file);
ModelApiResponse obj = uploadFile(request, petId, additionalMetadata, _file);
JsonNode result = mapper.valueToTree(obj);
return ok(result);
}
public abstract ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> file) throws Exception;
public abstract ModelApiResponse uploadFile(Http.Request request, Long petId, String additionalMetadata, Http.MultipartFormData.FilePart<TemporaryFile> _file) throws Exception;
}