Skip to content

Commit

Permalink
Checkstyle fixes to previous updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdonohue
tdonohue committed Apr 22, 2020
1 parent eb9ae8e commit e89b8d3
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 26 deletions.
52 changes: 29 additions & 23 deletions dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionGroupRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ public ResponseEntity<RepresentationModel<?>> postAdminGroup(@PathVariable UUID
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/adminGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> deleteAdminGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> deleteAdminGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException, IOException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -149,8 +150,9 @@ public ResponseEntity<RepresentationModel<?>> deleteAdminGroup(@PathVariable UUI
*/
@RequestMapping(method = RequestMethod.POST, value = "/submittersGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> postSubmittersGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> postSubmittersGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -183,8 +185,9 @@ public ResponseEntity<RepresentationModel<?>> postSubmittersGroup(@PathVariable
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/submittersGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> deleteSubmittersGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> deleteSubmittersGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException, IOException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -214,8 +217,9 @@ public ResponseEntity<RepresentationModel<?>> deleteSubmittersGroup(@PathVariabl
*/
@RequestMapping(method = RequestMethod.POST, value = "/itemReadGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> postItemReadGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> postItemReadGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -255,8 +259,9 @@ public ResponseEntity<RepresentationModel<?>> postItemReadGroup(@PathVariable UU
*/
@RequestMapping(method = RequestMethod.DELETE, value = "/itemReadGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> deleteItemReadGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> deleteItemReadGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException, IOException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -294,8 +299,9 @@ public ResponseEntity<RepresentationModel<?>> deleteItemReadGroup(@PathVariable
*/
@RequestMapping(method = RequestMethod.POST, value = "/bitstreamReadGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> postBitstreamReadGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> postBitstreamReadGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -337,8 +343,8 @@ public ResponseEntity<RepresentationModel<?>> postBitstreamReadGroup(@PathVariab
@RequestMapping(method = RequestMethod.DELETE, value = "/bitstreamReadGroup")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> deleteBitstreamReadGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException, IOException {

Context context = ContextUtil.obtainContext(request);
Expand Down Expand Up @@ -378,9 +384,9 @@ public ResponseEntity<RepresentationModel<?>> deleteBitstreamReadGroup(@PathVari
@RequestMapping(method = RequestMethod.GET, value = "/workflowGroups/{workflowRole}")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'READ')")
public ResponseEntity<RepresentationModel<?>> getWorkflowGroupForRole(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
throws Exception {
Context context = ContextUtil.obtainContext(request);
Collection collection = collectionService.find(context, uuid);
Expand Down Expand Up @@ -408,9 +414,9 @@ public ResponseEntity<RepresentationModel<?>> getWorkflowGroupForRole(@PathVaria
@RequestMapping(method = RequestMethod.POST, value = "/workflowGroups/{workflowRole}")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'READ')")
public ResponseEntity<RepresentationModel<?>> postWorkflowGroupForRole(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
throws Exception {
Context context = ContextUtil.obtainContext(request);
Collection collection = collectionService.find(context, uuid);
Expand Down Expand Up @@ -447,9 +453,9 @@ public ResponseEntity<RepresentationModel<?>> postWorkflowGroupForRole(@PathVari
@RequestMapping(method = RequestMethod.DELETE, value = "/workflowGroups/{workflowRole}")
@PreAuthorize("hasPermission(#uuid, 'COLLECTION', 'READ')")
public ResponseEntity<RepresentationModel<?>> deleteWorkflowGroupForRole(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
HttpServletResponse response,
HttpServletRequest request,
@PathVariable String workflowRole)
throws Exception {
Context context = ContextUtil.obtainContext(request);
Collection collection = collectionService.find(context, uuid);
Expand Down
7 changes: 4 additions & 3 deletions ...ce-server-webapp/src/main/java/org/dspace/app/rest/CommunityAdminGroupRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.rest.webmvc.ControllerUtils;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
import org.springframework.hateoas.RepresentationModel;;
import org.springframework.hateoas.RepresentationModel;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -107,8 +107,9 @@ public ResponseEntity<RepresentationModel<?>> postAdminGroup(@PathVariable UUID
*/
@RequestMapping(method = RequestMethod.DELETE)
@PreAuthorize("hasPermission(#uuid, 'COMMUNITY', 'WRITE')")
public ResponseEntity<RepresentationModel<?>> deleteAdminGroup(@PathVariable UUID uuid, HttpServletResponse response,
HttpServletRequest request)
public ResponseEntity<RepresentationModel<?>> deleteAdminGroup(@PathVariable UUID uuid,
HttpServletResponse response,
HttpServletRequest request)
throws SQLException, AuthorizeException, IOException {

Context context = ContextUtil.obtainContext(request);
Expand Down

0 comments on commit e89b8d3

Please sign in to comment.