Merge pull request #2467 from atmire/DS-4298_upload-endpoint-uuid-broken

[DS-4298] changed the PathVariable for the upload method with uuid to…
This commit is contained in:
Tim Donohue
2019-07-11 23:17:57 +02:00
committed by GitHub

View File

@@ -566,8 +566,8 @@ public class RestResourceController implements InitializingBean {
* the api category * the api category
* @param model * @param model
* the rest model that identify the REST resource collection * the rest model that identify the REST resource collection
* @param id * @param uuid
* the id of the specific rest resource * the uuid of the specific rest resource
* @param uploadfile * @param uploadfile
* the file to upload * the file to upload
* @return the created resource * @return the created resource
@@ -578,11 +578,11 @@ public class RestResourceController implements InitializingBean {
public <ID extends Serializable> ResponseEntity<ResourceSupport> upload(HttpServletRequest request, public <ID extends Serializable> ResponseEntity<ResourceSupport> upload(HttpServletRequest request,
@PathVariable String apiCategory, @PathVariable String apiCategory,
@PathVariable String model, @PathVariable String model,
@PathVariable UUID id, @PathVariable UUID uuid,
@RequestParam("file") MultipartFile @RequestParam("file") MultipartFile
uploadfile) uploadfile)
throws HttpRequestMethodNotSupportedException { throws HttpRequestMethodNotSupportedException {
return uploadInternal(request, apiCategory, model, id, uploadfile); return uploadInternal(request, apiCategory, model, uuid, uploadfile);
} }
/** /**