hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'D4CRIS-337' of https://github.com/4Science/DSpace into D4CRIS-337

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2017-11-07 12:18:57 +01:00
parent 9139a8421e db33e62bc4
commit fcf57ed177
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-spring-rest/src/main/java/org/dspace/app/rest/RestResourceController.java
View File

@@ -107,7 +107,7 @@ public class RestResourceController implements InitializingBean {
return findOneInternal(apiCategory, model, id, projection); return findOneInternal(apiCategory, model, id, projection);
} }
@RequestMapping(method = RequestMethod.GET, value = "/{id:[A-z0-9]+}") @RequestMapping(method = RequestMethod.GET, value = "/{id:^(?!^\\d+$)[[:alnum:]]+$+}")
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public DSpaceResource<RestModel> findOne(@PathVariable String apiCategory, @PathVariable String model, public DSpaceResource<RestModel> findOne(@PathVariable String apiCategory, @PathVariable String model,
@PathVariable String id, @RequestParam(required = false) String projection) { @PathVariable String id, @RequestParam(required = false) String projection) {
@@ -144,7 +144,7 @@ public class RestResourceController implements InitializingBean {
return findRelInternal(request, apiCategory, model, id, rel, page, assembler, projection); return findRelInternal(request, apiCategory, model, id, rel, page, assembler, projection);
} }
@RequestMapping(method = RequestMethod.GET, value = "/{id:[A-z0-9]+}/{rel}") @RequestMapping(method = RequestMethod.GET, value = "/{id:^(?!^\\d+$)[[:alnum:]]+$}/{rel}")
public ResourceSupport findRel(HttpServletRequest request, @PathVariable String apiCategory, public ResourceSupport findRel(HttpServletRequest request, @PathVariable String apiCategory,
@PathVariable String model, @PathVariable String id, @PathVariable String rel, Pageable page, @PathVariable String model, @PathVariable String id, @PathVariable String rel, Pageable page,
PagedResourcesAssembler assembler, @RequestParam(required = false) String projection) { PagedResourcesAssembler assembler, @RequestParam(required = false) String projection) {
@@ -158,7 +158,7 @@ public class RestResourceController implements InitializingBean {
return findRelInternal(request, apiCategory, model, uuid, rel, page, assembler, projection); return findRelInternal(request, apiCategory, model, uuid, rel, page, assembler, projection);
} }
@RequestMapping(method = RequestMethod.GET, value = "/{id:[A-z0-9]+}/{rel}/{relid:[A-z0-9]+}") @RequestMapping(method = RequestMethod.GET, value = "/{id:^(?!^\\d+$)[[:alnum:]]+$}/{rel}/{relid:[A-z0-9]+}")
public ResourceSupport findRel(HttpServletRequest request, @PathVariable String apiCategory, public ResourceSupport findRel(HttpServletRequest request, @PathVariable String apiCategory,
@PathVariable String model, @PathVariable String id, @PathVariable String rel, @PathVariable String relid, @PathVariable String model, @PathVariable String id, @PathVariable String rel, @PathVariable String relid,
Pageable page, PagedResourcesAssembler assembler, @RequestParam(required = false) String projection) { Pageable page, PagedResourcesAssembler assembler, @RequestParam(required = false) String projection) {