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/HEAD/root@127602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 22:19:36 +00:00
parent c60406cc54
commit 2648cf3f69
6 changed files with 169 additions and 66 deletions

View File

@@ -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();
}