Author: angela
Date: Tue Mar 14 15:09:14 2017
New Revision: 1786912
URL: http://svn.apache.org/viewvc?rev=1786912&view=rev
Log:
OAK-5929 : Redundant test for null with AuthorizableImpl.checkValidTree
implementations
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java?rev=1786912&r1=1786911&r2=1786912&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
Tue Mar 14 15:09:14 2017
@@ -65,7 +65,7 @@ abstract class AuthorizableImpl implemen
this.userManager = userManager;
}
- abstract void checkValidTree(Tree tree) throws RepositoryException;
+ abstract void checkValidTree(@Nonnull Tree tree) throws
RepositoryException;
static boolean isValidAuthorizableImpl(Authorizable authorizable) {
return authorizable instanceof AuthorizableImpl;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java?rev=1786912&r1=1786911&r2=1786912&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
Tue Mar 14 15:09:14 2017
@@ -54,8 +54,8 @@ class GroupImpl extends AuthorizableImpl
//---------------------------------------------------< AuthorizableImpl
>---
@Override
- void checkValidTree(Tree tree) throws RepositoryException {
- if (tree == null || !UserUtil.isType(tree, AuthorizableType.GROUP)) {
+ void checkValidTree(@Nonnull Tree tree) throws RepositoryException {
+ if (!UserUtil.isType(tree, AuthorizableType.GROUP)) {
throw new IllegalArgumentException("Invalid group node: node type
rep:Group expected.");
}
}
@@ -269,7 +269,8 @@ class GroupImpl extends AuthorizableImpl
if (member == null) {
if (ImportBehavior.ABORT == importBehavior) {
throw new ConstraintViolationException("Attempt to add
or remove a non-existing member " + memberId);
- } else if (ImportBehavior.IGNORE == importBehavior) {
+ } else {
+ // ImportBehavior.IGNORE is default in
UserUtil.getImportBehavior
String msg = "Attempt to add or remove non-existing
member '" + getID() + "' with ImportBehavior = IGNORE.";
log.debug(msg);
continue;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java?rev=1786912&r1=1786911&r2=1786912&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
Tue Mar 14 15:09:14 2017
@@ -34,7 +34,7 @@ class SystemUserImpl extends UserImpl {
}
@Override
- void checkValidTree(Tree tree) throws RepositoryException {
+ void checkValidTree(@Nonnull Tree tree) throws RepositoryException {
super.checkValidTree(tree);
if (!UserUtil.isSystemUser(tree)) {
throw new IllegalArgumentException("Invalid user node: node type
rep:SystemUser expected.");
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java?rev=1786912&r1=1786911&r2=1786912&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
Tue Mar 14 15:09:14 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
@@ -52,8 +53,8 @@ class UserImpl extends AuthorizableImpl
//---------------------------------------------------< AuthorizableImpl
>---
@Override
- void checkValidTree(Tree tree) throws RepositoryException {
- if (tree == null || !UserUtil.isType(tree, AuthorizableType.USER)) {
+ void checkValidTree(@Nonnull Tree tree) throws RepositoryException {
+ if (!UserUtil.isType(tree, AuthorizableType.USER)) {
throw new IllegalArgumentException("Invalid user node: node type
rep:User expected.");
}
}
