Review DisposalHoldController and DisposalHoldService

Author: hmiguim

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/DisposalHoldController.java

@@ -27,18 +27,13 @@
 
 import com.google.json.JsonSanitizer;
 
-import jakarta.servlet.http.HttpServletRequest;
-
 /**
  * @author Miguel Guimarães <mguimaraes@keep.pt>
  */
 @RestController
 @RequestMapping(path = "/api/v2/disposal/holds")
 public class DisposalHoldController implements DisposalHoldRestService {
 
-  @Autowired
-  HttpServletRequest request;
-
   @Autowired
   DisposalHoldService disposalHoldService;
 
@@ -51,9 +46,6 @@ public DisposalHolds listDisposalHolds() {
       @Override
       public DisposalHolds process(RequestContext requestContext, RequestControllerAssistant controllerAssistant)
         throws RODAException, RESTException, IOException {
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
-
         return disposalHoldService.getDisposalHolds(requestContext.getModelService());
       }
     });
@@ -67,8 +59,6 @@ public DisposalHold process(RequestContext requestContext, RequestControllerAssi
         throws RODAException, RESTException, IOException {
         controllerAssistant.setRelatedObjectId(id);
         controllerAssistant.setParameters(RodaConstants.DISPOSAL_HOLD_ID, id);
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
 
         return disposalHoldService.retrieveDisposalHold(id, requestContext.getModelService());
       }
@@ -82,8 +72,6 @@ public DisposalHold createDisposalHold(@RequestBody DisposalHold hold) {
       public DisposalHold process(RequestContext requestContext, RequestControllerAssistant controllerAssistant)
         throws RODAException, RESTException, IOException {
         controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_HOLD_PARAM, hold);
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
 
         // sanitize the input
         String sanitize = JsonSanitizer.sanitize(JsonUtils.getJsonFromObject(hold));
@@ -106,8 +94,6 @@ public DisposalHold process(RequestContext requestContext, RequestControllerAssi
         controllerAssistant.setRelatedObjectId(updateDisposalHoldRequest.getDisposalHold().getId());
         controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_HOLD_PARAM,
           updateDisposalHoldRequest.getDisposalHold());
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
 
         // sanitize the input
         String sanitize = JsonSanitizer
@@ -131,8 +117,6 @@ public Job process(RequestContext requestContext, RequestControllerAssistant con
         controllerAssistant.setParameters(RodaConstants.CONTROLLER_SELECTED_PARAM, items,
           RodaConstants.CONTROLLER_DISPOSAL_HOLD_ID_PARAM, disposalHoldId,
           RodaConstants.CONTROLLER_DISPOSAL_HOLD_OVERRIDE_PARAM, override);
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
 
         // delegate
         return disposalHoldService.applyDisposalHold(requestContext.getUser(),
@@ -149,8 +133,6 @@ public Job process(RequestContext requestContext, RequestControllerAssistant con
         throws RODAException, RESTException {
         controllerAssistant.setRelatedObjectId(id);
         controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_HOLD_ID_PARAM, id);
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
 
         // delegate
         return disposalHoldService.liftDisposalHold(requestContext.getUser(), id, details);
@@ -170,8 +152,7 @@ public Job process(RequestContext requestContext, RequestControllerAssistant con
           disassociateDisposalHoldRequest.getSelectedItems(), RodaConstants.CONTROLLER_DISPOSAL_HOLD_ID_PARAM,
           disposalHoldId, RodaConstants.CONTROLLER_DISPOSAL_HOLD_DISASSOCIATE_ALL,
           disassociateDisposalHoldRequest.getClear());
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
+
         // delegate
         return disposalHoldService.disassociateDisposalHold(requestContext.getUser(), disassociateDisposalHoldRequest,
           disposalHoldId);
@@ -185,8 +166,6 @@ public DisposalTransitiveHoldsAIPMetadata listTransitiveHolds(String aipId) {
       @Override
       public DisposalTransitiveHoldsAIPMetadata process(RequestContext requestContext,
         RequestControllerAssistant controllerAssistant) throws RODAException, RESTException, IOException {
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
         return disposalHoldService.listTransitiveDisposalHolds(aipId, requestContext.getModelService());
       }
     });
@@ -198,8 +177,7 @@ public DisposalHoldsAIPMetadata listDisposalHoldsAssociation(String aipId) {
       @Override
       public DisposalHoldsAIPMetadata process(RequestContext requestContext,
         RequestControllerAssistant controllerAssistant) throws RODAException, RESTException, IOException {
-        // check user permissions
-        controllerAssistant.checkRoles(requestContext.getUser());
+
         return requestContext.getModelService().listDisposalHoldsAssociation(aipId);
       }
     });

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/services/DisposalHoldService.java

@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.roda.core.RodaCoreFactory;
 import org.roda.core.data.common.RodaConstants;
 import org.roda.core.data.exceptions.AlreadyExistsException;
 import org.roda.core.data.exceptions.AuthorizationDeniedException;
@@ -20,7 +19,6 @@
 import org.roda.core.data.v2.index.select.SelectedItemsNone;
 import org.roda.core.data.v2.ip.IndexedAIP;
 import org.roda.core.data.v2.ip.disposalhold.DisassociateDisposalHoldRequest;
-import org.roda.core.data.v2.ip.disposalhold.LiftDisposalHoldRequest;
 import org.roda.core.data.v2.jobs.Job;
 import org.roda.core.data.v2.user.User;
 import org.roda.core.model.ModelService;