Skip to content

Commit 626fe32

Browse files
committed
Review DisposalRuleController
1 parent 3791685 commit 626fe32

1 file changed

Lines changed: 0 additions & 18 deletions

File tree

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.roda.core.data.utils.JsonUtils;
88
import org.roda.core.data.v2.disposal.rule.DisposalRule;
99
import org.roda.core.data.v2.disposal.rule.DisposalRules;
10-
import org.roda.core.data.v2.disposal.schedule.DisposalSchedule;
1110
import org.roda.core.data.v2.jobs.Job;
1211
import org.roda.wui.api.v2.exceptions.RESTException;
1312
import org.roda.wui.api.v2.services.DisposalRuleService;
@@ -21,18 +20,13 @@
2120

2221
import com.google.json.JsonSanitizer;
2322

24-
import jakarta.servlet.http.HttpServletRequest;
25-
2623
/**
2724
* @author Miguel Guimarães <mguimaraes@keep.pt>
2825
*/
2926
@RestController
3027
@RequestMapping(path = "/api/v2/disposal/rules")
3128
public class DisposalRuleController implements DisposalRuleRestService {
3229

33-
@Autowired
34-
HttpServletRequest request;
35-
3630
@Autowired
3731
DisposalRuleService disposalRuleService;
3832

@@ -45,9 +39,6 @@ public DisposalRules listDisposalRules() {
4539
@Override
4640
public DisposalRules process(RequestContext requestContext, RequestControllerAssistant controllerAssistant)
4741
throws RODAException, RESTException, IOException {
48-
// check user permissions
49-
controllerAssistant.checkRoles(requestContext.getUser());
50-
5142
return disposalRuleService.listDisposalRules(requestContext.getModelService());
5243
}
5344
});
@@ -62,7 +53,6 @@ public DisposalRule process(RequestContext requestContext, RequestControllerAssi
6253
// check user permissions
6354
controllerAssistant.setRelatedObjectId(id);
6455
controllerAssistant.setParameters(RodaConstants.DISPOSAL_RULE_ID, id);
65-
controllerAssistant.checkRoles(requestContext.getUser());
6656

6757
return disposalRuleService.retrieveDisposalHold(id, requestContext.getModelService());
6858
}
@@ -76,8 +66,6 @@ public DisposalRule createDisposalRule(@RequestBody DisposalRule disposalRule) {
7666
public DisposalRule process(RequestContext requestContext, RequestControllerAssistant controllerAssistant)
7767
throws RODAException, RESTException, IOException {
7868
controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_RULE_PARAM, disposalRule);
79-
// check user permissions
80-
controllerAssistant.checkRoles(requestContext.getUser());
8169

8270
// sanitize the input
8371
String sanitize = JsonSanitizer.sanitize(JsonUtils.getJsonFromObject(disposalRule));
@@ -99,8 +87,6 @@ public DisposalRule process(RequestContext requestContext, RequestControllerAssi
9987
throws RODAException, RESTException, IOException {
10088
controllerAssistant.setRelatedObjectId(disposalRule.getId());
10189
controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_RULE_PARAM, disposalRule);
102-
// check user permissions
103-
controllerAssistant.checkRoles(requestContext.getUser());
10490

10591
// sanitize the input
10692
String sanitize = JsonSanitizer.sanitize(JsonUtils.getJsonFromObject(disposalRule));
@@ -123,8 +109,6 @@ public Void process(RequestContext requestContext, RequestControllerAssistant co
123109
throws RODAException, RESTException, IOException {
124110
controllerAssistant.setRelatedObjectId(id);
125111
controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_RULE_ID_PARAM, id);
126-
// check user permissions
127-
controllerAssistant.checkRoles(requestContext.getUser());
128112

129113
// delegate
130114
disposalRuleService.deleteDisposalRule(id, requestContext);
@@ -141,8 +125,6 @@ public Job process(RequestContext requestContext, RequestControllerAssistant con
141125
throws RODAException, RESTException, IOException {
142126
controllerAssistant.setParameters(RodaConstants.CONTROLLER_DISPOSAL_RULE_OVERRIDE_MANUAL_PARAM,
143127
Boolean.toString(overrideManualAssociations));
144-
// check user permissions
145-
controllerAssistant.checkRoles(requestContext.getUser());
146128

147129
// delegate action to service
148130
return disposalRuleService.applyDisposalRules(requestContext.getUser(), overrideManualAssociations);

0 commit comments

Comments
 (0)