Repository: wicket Updated Branches: refs/heads/wicket-7.x f8ffe3e13 -> 13b600c30
WICKET-6463 Please add additional constructor to Roles (cherry picked from commit 1f805dd5af6d06e9209907f33f3c7ab4a4678e76) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/13b600c3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/13b600c3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/13b600c3 Branch: refs/heads/wicket-7.x Commit: 13b600c30d681281f40f8300649f78e970b816a9 Parents: f8ffe3e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 4 22:11:39 2017 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 4 22:12:30 2017 +0300 ---------------------------------------------------------------------- .../authroles/authorization/strategies/role/Roles.java | 9 +++++++++ .../annotations/AnnotationsRoleAuthorizationStrategy.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/13b600c3/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java index 5d272de..fa5251d 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/Roles.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.authroles.authorization.strategies.role; +import java.util.Collection; import java.util.HashSet; import org.apache.wicket.util.io.IClusterable; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.StringList; @@ -53,6 +55,7 @@ public class Roles extends HashSet<String> implements IClusterable */ public Roles(final String roles) { + Args.notNull(roles, "roles"); for (final String role : roles.split("\\s*,\\s*")) { add(role); @@ -67,12 +70,18 @@ public class Roles extends HashSet<String> implements IClusterable */ public Roles(final String[] roles) { + Args.notNull(roles, "roles"); for (final String role : roles) { add(role); } } + public Roles(final Collection<String> roles) { + Args.notNull(roles, "roles"); + addAll(roles); + } + /** * Whether this roles object containes the provided role. * http://git-wip-us.apache.org/repos/asf/wicket/blob/13b600c3/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java index ff7b9dd..96163e1 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategy.java @@ -171,7 +171,7 @@ public class AnnotationsRoleAuthorizationStrategy extends AbstractRoleAuthorizat } Roles acceptedRoles = new Roles(authorizeActionAnnotation.roles()); - if (!(isEmpty(acceptedRoles) || hasAny(acceptedRoles))) + if (!hasAny(acceptedRoles)) { return false; }
