[PLINK-494] - Rename @RequiresAccount to @loggedin.

pedroigor · pedroigor · commit 02ff6270ad06 · 2014-06-16T11:57:43.000-03:00
diff --git a/modules/deltaspike/src/main/java/org/picketlink/authorization/DefaultAuthorizationManager.java b/modules/deltaspike/src/main/java/org/picketlink/authorization/DefaultAuthorizationManager.java
@@ -24,8 +24,8 @@
 import org.apache.deltaspike.security.api.authorization.Secures;
 import org.picketlink.Identity;
 import org.picketlink.authorization.annotations.GroupsAllowed;
+import org.picketlink.authorization.annotations.LoggedIn;
 import org.picketlink.authorization.annotations.PartitionsAllowed;
-import org.picketlink.authorization.annotations.RequiresAccount;
 import org.picketlink.authorization.annotations.RequiresPermission;
 import org.picketlink.authorization.annotations.Restrict;
 import org.picketlink.authorization.annotations.RolesAllowed;
@@ -70,13 +70,13 @@ public class DefaultAuthorizationManager {
     private RelationshipManager relationshipManager;
 
     @Secures
-    @RequiresAccount
+    @LoggedIn
     public boolean isLoggedIn(InvocationContext invocationContext) {
-        RequiresAccount requiresAccount = getAnnotation(invocationContext, RequiresAccount.class);
+        LoggedIn loggedIn = getAnnotation(invocationContext, LoggedIn.class);
         Class<? extends Account> accountType = Account.class;
 
-        if (requiresAccount != null) {
-            accountType = requiresAccount.type();
+        if (loggedIn != null) {
+            accountType = loggedIn.requiresAccount();
         }
 
         Account account = getIdentity().getAccount();
diff --git a/modules/deltaspike/src/main/java/org/picketlink/authorization/annotations/LoggedIn.java b/modules/deltaspike/src/main/java/org/picketlink/authorization/annotations/LoggedIn.java
@@ -42,7 +42,7 @@
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Documented
 @SecurityBindingType
-public @interface RequiresAccount {
+public @interface LoggedIn {
 
     /**
      * <p>If defined, checks if the authenticated account is the same or a subclass of the given {@link org.picketlink.idm.model.Account} type.</p>
@@ -52,6 +52,6 @@
      * @return
      */
     @Nonbinding
-    Class<? extends Account> type() default Account.class;
+    Class<? extends Account> requiresAccount() default Account.class;
 
 }
diff --git a/tests/src/test/java/org/picketlink/test/authorization/AnnotationProtectedBean.java b/tests/src/test/java/org/picketlink/test/authorization/AnnotationProtectedBean.java
@@ -22,8 +22,8 @@
 package org.picketlink.test.authorization;
 
 import org.picketlink.authorization.annotations.GroupsAllowed;
+import org.picketlink.authorization.annotations.LoggedIn;
 import org.picketlink.authorization.annotations.PartitionsAllowed;
-import org.picketlink.authorization.annotations.RequiresAccount;
 import org.picketlink.authorization.annotations.RequiresPermission;
 import org.picketlink.authorization.annotations.RolesAllowed;
 import org.picketlink.idm.model.basic.Realm;
@@ -34,7 +34,7 @@
  */
 public class AnnotationProtectedBean {
 
-    @RequiresAccount
+    @LoggedIn
     public void protectedFromUnauthenticatedUsers(){
 
     }
