From cefbb63e2aeca4a52ce6a8d162769f802bd4d27f Mon Sep 17 00:00:00 2001 From: Sam Ottenhoff Date: Thu, 18 Apr 2024 13:23:05 -0400 Subject: [PATCH] clean up security advisor --- .../gradebook/GradebookCriteriaFactory.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/impl/src/java/org/sakaiproject/certification/criteria/impl/gradebook/GradebookCriteriaFactory.java b/impl/src/java/org/sakaiproject/certification/criteria/impl/gradebook/GradebookCriteriaFactory.java index cfc045e78d..a4f615a285 100644 --- a/impl/src/java/org/sakaiproject/certification/criteria/impl/gradebook/GradebookCriteriaFactory.java +++ b/impl/src/java/org/sakaiproject/certification/criteria/impl/gradebook/GradebookCriteriaFactory.java @@ -193,21 +193,14 @@ public boolean isCriterionMet(Criterion criterion) throws UnknownCriterionTypeEx protected Object doSecureGradebookAction(SecureGradebookActionCallback callback) throws Exception { final String contextId = contextId(); - SecurityAdvisor yesMan = new SecurityAdvisor() { - public SecurityAdvice isAllowed(String userId, String function, String reference) { - String compTo; - if (contextId.startsWith("/site/")) { - compTo = contextId; - } else { - compTo = "/site/" + contextId; - } + SecurityAdvisor yesMan = (userId, function, reference) -> { + String compTo = contextId.startsWith("/site/") ? contextId : "/site/" + contextId; - if (reference.equals(compTo) && (PERM_VIEW_OWN_GRADES.equals(function) || - PERM_EDIT_ASSIGNMENTS.equals(function))) { - return SecurityAdvice.ALLOWED; - } else { - return SecurityAdvice.PASS; - } + if (reference.equals(compTo) && (PERM_VIEW_OWN_GRADES.equals(function) || + PERM_EDIT_ASSIGNMENTS.equals(function))) { + return SecurityAdvisor.SecurityAdvice.ALLOWED; + } else { + return SecurityAdvisor.SecurityAdvice.PASS; } };