jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1375424 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/
Date Tue, 21 Aug 2012 08:09:28 GMT
Author: mduerig
Date: Tue Aug 21 08:09:27 2012
New Revision: 1375424

URL: http://svn.apache.org/viewvc?rev=1375424&view=rev
Log:
OAK-101: implement identifier handling (byUUID, byIdentifier, etc)
initial implementation for getReferences. Depends on OAK-261

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProviderImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1375424&r1=1375423&r2=1375424&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Tue Aug 21 08:09:27 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
 import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -28,6 +29,10 @@ import javax.annotation.Nonnull;
 import javax.jcr.PropertyType;
 import javax.jcr.query.Query;
 
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.api.CoreValue;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -163,6 +168,8 @@ public class IdentifierManager {
      * Searches all reference properties to the specified {@code tree} that match
      * the given name and node type constraints.
      *
+     * @param weak  if {@code true} only weak references are returned. Otherwise only
+     *              hard references are returned.
      * @param tree The tree for which references should be searched.
      * @param propertyName A name constraint for the reference properties;
      * {@code null} if no constraint should be enforced.
@@ -172,37 +179,76 @@ public class IdentifierManager {
      * specified {@code tree} and matching the constraints.
      */
     @Nonnull
-    public Set<String> getReferences(Tree tree, String propertyName, String... nodeTypeNames)
{
+    public Set<String> getReferences(boolean weak, Tree tree, String propertyName,
final String... nodeTypeNames) {
         if (!isReferenceable(tree)) {
             return Collections.emptySet();
         } else {
-            String uuid = getIdentifier(tree);
-            // TODO execute query.
-            throw new UnsupportedOperationException("TODO: Node.getReferences");
+            try {
+                String uuid = getIdentifier(tree);
+                String reference = weak ? PropertyType.TYPENAME_WEAKREFERENCE : PropertyType.TYPENAME_REFERENCE;
+                propertyName = propertyName == null ? "*" : propertyName;   // TODO: sanitize
against injection attacks!?
+                Map<String, ? extends CoreValue> bindings = Collections.singletonMap("id",
new StringValue(uuid));
+
+                // TODO query depends on OAK-261
+                Result result = queryEngine.executeQuery(
+                        "SELECT * FROM [nt:base] WHERE PROPERTY([" + propertyName + "], '"
+ reference + "') = $uuid",
+                        Query.JCR_SQL2, Long.MAX_VALUE, 0, bindings, new NamePathMapper.Default());
+
+                Iterable<String> paths = Iterables.transform(result.getRows(),
+                        new Function<ResultRow, String>() {
+                            @Override
+                            public String apply(ResultRow row) {
+                                return row.getPath();
+                            }
+                });
+
+                if (nodeTypeNames.length > 0) {
+                    paths = Iterables.filter(paths, new Predicate<String>() {
+                        @Override
+                        public boolean apply(String path) {
+                            Tree tree = root.getTree(path);
+                            if (tree != null) {
+                                for (String ntName : nodeTypeNames) {
+                                    if (hasType(tree, ntName)) {
+                                        return true;
+                                    }
+                                }
+                            }
+                            return false;
+                        }
+                    });
+                }
+
+                return Sets.newHashSet(paths);
+            }
+            catch (ParseException e) {
+                log.error("query failed", e);
+                return Collections.emptySet();
+            }
         }
     }
 
-    /**
-     * Searches all weak reference properties to the specified {@code tree} that
-     * match the given name and node type constraints.
-     *
-     * @param tree The tree for which weak references should be searched.
-     * @param propertyName A name constraint for the weak reference properties;
-     * {@code null} if no constraint should be enforced.
-     * @param nodeTypeNames Node type constraints to be enforced when using
-     * for reference properties or {@code null} to avoid node type constraints.
-     * @return A set of oak paths of those weak reference properties referring to the
-     * specified {@code tree} and matching the constraints.
-     */
-    @Nonnull
-    public Set<String> getWeakReferences(Tree tree, String propertyName, String...
nodeTypeNames) {
-        if (!isReferenceable(tree)) {
-            return Collections.emptySet();
-        } else {
-            String uuid = getIdentifier(tree);
-            // TODO execute query.
-            throw new UnsupportedOperationException("TODO: Node.getWeakReferences");
+    private static boolean hasType(Tree tree, String ntName) {
+        // TODO use NodeType.isNodeType to determine type membership instead of equality
on type names
+        PropertyState pType = tree.getProperty(JcrConstants.JCR_PRIMARYTYPE);
+        if (pType != null) {
+            String primaryType = pType.getValue().getString();
+            if (ntName.equals(primaryType)) {
+                return true;
+            }
         }
+
+        PropertyState pMixin = tree.getProperty(JcrConstants.JCR_MIXINTYPES);
+        if (pMixin != null) {
+            List<CoreValue> mixinTypes = pMixin.getValues();
+            for (CoreValue mixinType : mixinTypes) {
+                if (ntName.equals(mixinType.getString())) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
     }
 
     public boolean isReferenceable(Tree tree) {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProviderImpl.java?rev=1375424&r1=1375423&r2=1375424&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProviderImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProviderImpl.java
Tue Aug 21 08:09:27 2012
@@ -50,8 +50,8 @@ import org.apache.jackrabbit.oak.namepat
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
 import org.apache.jackrabbit.oak.spi.security.principal.TreeBasedPrincipal;
 import org.apache.jackrabbit.oak.spi.security.user.MembershipProvider;
-import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.oak.spi.security.user.UserConfig;
+import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.oak.spi.security.user.UserProvider;
 import org.apache.jackrabbit.oak.util.NodeUtil;
 import org.apache.jackrabbit.util.Text;
@@ -295,7 +295,7 @@ public class UserProviderImpl implements
     @Override
     public Iterator<String> getMembership(Tree authorizableTree, boolean includeInherited)
{
         Set<String> groupPaths = new HashSet<String>();
-        Set<String> refPaths = identifierManager.getWeakReferences(authorizableTree,
null, NT_REP_GROUP, NT_REP_MEMBERS);
+        Set<String> refPaths = identifierManager.getReferences(true, authorizableTree,
null, NT_REP_GROUP, NT_REP_MEMBERS);
         for (String propPath : refPaths) {
             int index = propPath.indexOf('/'+REP_MEMBERS);
             if (index > 0) {

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1375424&r1=1375423&r2=1375424&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Tue Aug 21 08:09:27 2012
@@ -756,10 +756,7 @@ public class NodeImpl extends ItemImpl<N
             public PropertyIterator perform() throws InvalidItemStateException {
                 IdentifierManager idManager = sessionDelegate.getIdManager();
 
-                Set<String> propertyOakPaths = weak
-                    ? idManager.getWeakReferences(dlg.getTree(), name)
-                    : idManager.getReferences(dlg.getTree(), name);
-
+                Set<String> propertyOakPaths = idManager.getReferences(weak, dlg.getTree(),
name);
                 Iterable<Property> properties = Iterables.transform(
                     propertyOakPaths,
                     new Function<String, Property>() {



Mime
View raw message