Merged HEAD (5.2) to 5.2.N (5.2.1)

127602 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127342 jvonka: Node Associations - peer assoc permissions
      - alt impl using temp wrapper instead of full override
      RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java

@@ -69,6 +69,7 @@ public class AbstractNodeRelation implements InitializingBean
 
     protected ServiceRegistry sr;
     protected NodeService nodeService;
+    protected NodeAssocService nodeAssocService; // wraps initial Peer Assoc permissions
     protected NamespaceService namespaceService;
     protected DictionaryService dictionaryService;
     protected Nodes nodes;
@@ -84,9 +85,9 @@ public class AbstractNodeRelation implements InitializingBean
     }
 
     // Introduces permissions for Node Assoc (see public-rest-context.xml)
-    public void setNodeService(NodeService nodeService)
+    public void setNodeAssocService(NodeAssocService nodeAssocService)
     {
-        this.nodeService = nodeService;
+        this.nodeAssocService = nodeAssocService;
     }
 
     @Override
@@ -95,7 +96,7 @@ public class AbstractNodeRelation implements InitializingBean
         PropertyCheck.mandatory(this, "serviceRegistry", sr);
         ParameterCheck.mandatory("nodes", this.nodes);
 
-        //this.nodeService = sr.getNodeService();
+        this.nodeService = sr.getNodeService();
         this.namespaceService = sr.getNamespaceService();
         this.dictionaryService = sr.getDictionaryService();
     }

source/java/org/alfresco/rest/api/nodes/NodeAssocService.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2016 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.service.cmr.repository.AssociationExistsException;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @deprecated Intermediate wrapper (not a public service) - eventually push permissions down to NodeService
+ *
+ * @author janv
+ */
+public interface NodeAssocService
+{
+    AssociationRef createAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
+            throws InvalidNodeRefException, AssociationExistsException;
+
+    void removeAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
+            throws InvalidNodeRefException;
+
+    void setAssociations(NodeRef sourceRef, QName assocTypeQName, List<NodeRef> targetRefs);
+
+    AssociationRef getAssoc(Long id);
+
+    List<AssociationRef> getTargetAssocs(NodeRef sourceRef, QNamePattern qnamePattern)
+            throws InvalidNodeRefException;
+
+    List<AssociationRef> getTargetAssocsByPropertyValue(NodeRef sourceRef, QNamePattern qnamePattern, QName propertyQName, Serializable propertyValue);
+
+    List<AssociationRef> getSourceAssocs(NodeRef targetRef, QNamePattern qnamePattern)
+            throws InvalidNodeRefException;
+}

source/java/org/alfresco/rest/api/nodes/NodeAssocServiceImpl.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005-2016 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.rest.api.nodes;
+
+import org.alfresco.service.cmr.repository.AssociationExistsException;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @deprecated Intermediate wrapper (not a public service) - eventually push permissions down to NodeService
+ *
+ * @author janv
+ */
+public class NodeAssocServiceImpl implements NodeAssocService
+{
+    protected NodeService nodeService;
+
+    public void setNodeService(NodeService nodeService)
+    {
+        this.nodeService = nodeService;
+    }
+
+    public AssociationRef createAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
+            throws InvalidNodeRefException, AssociationExistsException
+
+    {
+        return nodeService.createAssociation(sourceRef, targetRef, assocTypeQName);
+    }
+
+    public void removeAssociation(NodeRef sourceRef, NodeRef targetRef, QName assocTypeQName)
+            throws InvalidNodeRefException
+    {
+        nodeService.removeAssociation(sourceRef, targetRef, assocTypeQName);
+    }
+
+    public void setAssociations(NodeRef sourceRef, QName assocTypeQName, List<NodeRef> targetRefs)
+    {
+        nodeService.setAssociations(sourceRef, assocTypeQName, targetRefs);
+    }
+
+    public AssociationRef getAssoc(Long id)
+    {
+        return nodeService.getAssoc(id);
+    }
+
+    public List<AssociationRef> getTargetAssocs(NodeRef sourceRef, QNamePattern qnamePattern)
+            throws InvalidNodeRefException
+    {
+        return nodeService.getTargetAssocs(sourceRef, qnamePattern);
+    }
+
+
+    public List<AssociationRef> getTargetAssocsByPropertyValue(NodeRef sourceRef, QNamePattern qnamePattern, QName propertyQName, Serializable propertyValue)
+    {
+        return nodeService.getTargetAssocsByPropertyValue(sourceRef, qnamePattern, propertyQName, propertyValue);
+    }
+
+    public List<AssociationRef> getSourceAssocs(NodeRef targetRef, QNamePattern qnamePattern)
+            throws InvalidNodeRefException
+    {
+        return nodeService.getSourceAssocs(targetRef, qnamePattern);
+    }
+}

source/java/org/alfresco/rest/api/nodes/NodeSourcesRelation.java

@@ -51,7 +51,7 @@ public class NodeSourcesRelation extends AbstractNodeRelation implements Relatio
 
         QNamePattern assocTypeQNameParam = getAssocTypeFromWhereElseAll(parameters);
 
-        List<AssociationRef> assocRefs = nodeService.getSourceAssocs(targetNodeRef, assocTypeQNameParam);
+        List<AssociationRef> assocRefs = nodeAssocService.getSourceAssocs(targetNodeRef, assocTypeQNameParam);
 
         return listNodePeerAssocs(assocRefs, parameters, false);
     }

source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java

@@ -65,7 +65,7 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
 
         QNamePattern assocTypeQNameParam = getAssocTypeFromWhereElseAll(parameters);
 
-        List<AssociationRef> assocRefs = nodeService.getTargetAssocs(sourceNodeRef, assocTypeQNameParam);
+        List<AssociationRef> assocRefs = nodeAssocService.getTargetAssocs(sourceNodeRef, assocTypeQNameParam);
 
         return listNodePeerAssocs(assocRefs, parameters, true);
     }
@@ -88,7 +88,7 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
             try
             {
                 NodeRef tgtNodeRef = nodes.validateNode(targetNodeId);
-                nodeService.createAssociation(srcNodeRef, tgtNodeRef, assocTypeQName);
+                nodeAssocService.createAssociation(srcNodeRef, tgtNodeRef, assocTypeQName);
             }
             catch (AssociationExistsException aee)
             {
@@ -125,12 +125,12 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
 
         boolean found = false;
 
-        List<AssociationRef> assocRefs = nodeService.getTargetAssocs(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, sourceNodeId), assocTypeQName);
+        List<AssociationRef> assocRefs = nodeAssocService.getTargetAssocs(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, sourceNodeId), assocTypeQName);
         for (AssociationRef assocRef : assocRefs)
         {
             if (assocRef.getTargetRef().equals(tgtNodeRef))
             {
-                nodeService.removeAssociation(srcNodeRef, tgtNodeRef, assocRef.getTypeQName());
+                nodeAssocService.removeAssociation(srcNodeRef, tgtNodeRef, assocRef.getTypeQName());
                 found = true;
             }
         }