You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/03/13 21:45:24 UTC
[08/50] wicket git commit: WICKET-5749 small corrections
WICKET-5749 small corrections
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da490530
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da490530
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da490530
Branch: refs/heads/pr-86-media_tags
Commit: da4905305dc1d1bcd861d2393502fe10e88390f3
Parents: b8b9b30
Author: Carl-Eric Menzel <cm...@wicketbuch.de>
Authored: Tue Feb 24 09:59:16 2015 +0100
Committer: Carl-Eric Menzel <cm...@wicketbuch.de>
Committed: Tue Feb 24 09:59:16 2015 +0100
----------------------------------------------------------------------
.../annotations/AnnotationsRoleAuthorizationStrategy.java | 8 +++++---
.../strategies/role/annotations/AuthorizeResource.java | 7 ++++++-
.../AnnotationsRoleAuthorizationStrategyTest.java | 4 +++-
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/da490530/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 077f096..9b1f95e 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
@@ -146,8 +146,9 @@ public class AnnotationsRoleAuthorizationStrategy extends AbstractRoleAuthorizat
@Override
public boolean isResourceAuthorized(IResource resource, PageParameters pageParameters)
{
- return checkResource(resource.getClass().getAnnotation(AuthorizeResource.class)) || checkResource(
- resource.getClass().getPackage().getAnnotation(AuthorizeResource.class));
+ Class<? extends IResource> resourceClass = resource.getClass();
+ return checkResource(resourceClass.getAnnotation(AuthorizeResource.class)) || checkResource(
+ resourceClass.getPackage().getAnnotation(AuthorizeResource.class));
}
private boolean checkResource(AuthorizeResource annotation)
@@ -155,7 +156,8 @@ public class AnnotationsRoleAuthorizationStrategy extends AbstractRoleAuthorizat
if (annotation != null)
{
return hasAny(new Roles(annotation.value()));
- } else
+ }
+ else
{
return false;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/da490530/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AuthorizeResource.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AuthorizeResource.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AuthorizeResource.java
index a78eb37..d083347 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AuthorizeResource.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AuthorizeResource.java
@@ -16,7 +16,12 @@
*/
package org.apache.wicket.authroles.authorization.strategies.role.annotations;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* Annotation for configuring what roles are allowed for requesting the annotated resource. It works analogously
http://git-wip-us.apache.org/repos/asf/wicket/blob/da490530/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java
index 8371990..d5eecbf 100644
--- a/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java
+++ b/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/annotations/AnnotationsRoleAuthorizationStrategyTest.java
@@ -32,7 +32,9 @@ import org.mockito.Mockito;
*/
public class AnnotationsRoleAuthorizationStrategyTest
{
-
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-3974
+ */
@Test
public void allowsRenderWithRequiredRoleAndNoDeniedRole()
{