You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2017/03/06 13:14:42 UTC
svn commit: r1785647 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/security/user/
main/java/org/apache/jackrabbit/oak/security/user/query/
test/java/org/apache/jackrabbit/oak/security/user/query/
Author: angela
Date: Mon Mar 6 13:14:42 2017
New Revision: 1785647
URL: http://svn.apache.org/viewvc?rev=1785647&view=rev
Log:
OAK-5892 : ResultRowToAuthorizable: create user/group from tree
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java?rev=1785647&r1=1785646&r2=1785647&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java Mon Mar 6 13:14:42 2017
@@ -361,7 +361,7 @@ public class UserManagerImpl implements
//--------------------------------------------------------------------------
@CheckForNull
- Authorizable getAuthorizable(@CheckForNull Tree tree) throws RepositoryException {
+ public Authorizable getAuthorizable(@CheckForNull Tree tree) throws RepositoryException {
if (tree == null || !tree.exists()) {
return null;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java?rev=1785647&r1=1785646&r2=1785647&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java Mon Mar 6 13:14:42 2017
@@ -23,10 +23,10 @@ import javax.jcr.RepositoryException;
import com.google.common.base.Function;
import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.security.user.UserManagerImpl;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
import org.slf4j.Logger;
@@ -40,11 +40,11 @@ class ResultRowToAuthorizable implements
private static final Logger log = LoggerFactory.getLogger(ResultRowToAuthorizable.class);
- private final UserManager userManager;
+ private final UserManagerImpl userManager;
private final Root root;
private final AuthorizableType targetType;
- ResultRowToAuthorizable(@Nonnull UserManager userManager, @Nonnull Root root,
+ ResultRowToAuthorizable(@Nonnull UserManagerImpl userManager, @Nonnull Root root,
@Nullable AuthorizableType targetType) {
this.userManager = userManager;
this.root = root;
@@ -71,10 +71,7 @@ class ResultRowToAuthorizable implements
type = UserUtil.getType(tree);
}
if (tree.exists() && (targetType == null || targetType == type)) {
- String id = UserUtil.getAuthorizableId(tree);
- if (id != null) {
- authorizable = userManager.getAuthorizable(id);
- }
+ authorizable = userManager.getAuthorizable(tree);
}
} catch (RepositoryException e) {
log.debug("Failed to access authorizable " + resultPath);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1785647&r1=1785646&r2=1785647&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java Mon Mar 6 13:14:42 2017
@@ -36,12 +36,12 @@ import com.google.common.collect.Iterato
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Query;
import org.apache.jackrabbit.api.security.user.QueryBuilder;
-import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.Result;
import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
+import org.apache.jackrabbit.oak.security.user.UserManagerImpl;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
@@ -58,12 +58,12 @@ public class UserQueryManager {
private static final Logger log = LoggerFactory.getLogger(UserQueryManager.class);
- private final UserManager userManager;
+ private final UserManagerImpl userManager;
private final NamePathMapper namePathMapper;
private final ConfigurationParameters config;
private final Root root;
- public UserQueryManager(UserManager userManager, NamePathMapper namePathMapper,
+ public UserQueryManager(UserManagerImpl userManager, NamePathMapper namePathMapper,
ConfigurationParameters config, Root root) {
this.userManager = userManager;
this.namePathMapper = namePathMapper;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1785647&r1=1785646&r2=1785647&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java Mon Mar 6 13:14:42 2017
@@ -22,9 +22,9 @@ import javax.jcr.ValueFactory;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
-import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl;
+import org.apache.jackrabbit.oak.security.user.UserManagerImpl;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@ public class UserQueryManagerTest extend
public void before() throws Exception {
super.before();
- UserManager userMgr = getUserManager(root);
+ UserManagerImpl userMgr = (UserManagerImpl) getUserManager(root);
user = getTestUser();
queryMgr = new UserQueryManager(userMgr, namePathMapper, getUserConfiguration().getParameters(), root);