Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

126567 jvonka: Node Associations - further updates
   - for child assocs, do not expose assoc child qname (nominally like file/folder for primary child assoc)
   - additional api tests (+ve & -ve) for peer assocs & secondary child assocs
   - RA-745, RA-920, RA-921, RA-930, RA-742, RA-918, RA-919


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 21:42:19 +00:00
parent db6dec979f
commit 4bb6852a79
9 changed files with 257 additions and 176 deletions

View File

@@ -24,37 +24,24 @@ package org.alfresco.rest.api.model;
public class AssocChild extends Assoc
{
private String childId;
private String prefixAssocChildQName;
private Boolean isPrimaryParent;
public AssocChild()
{
}
public AssocChild(String prefixAssocTypeQName, boolean isPrimaryParent, String prefixAssocChildQName)
public AssocChild(String prefixAssocTypeQName, boolean isPrimaryParent)
{
super(prefixAssocTypeQName);
this.prefixAssocChildQName = prefixAssocChildQName;
this.isPrimaryParent = isPrimaryParent;
}
public AssocChild(String childId, String prefixAssocTypeQName, String prefixAssocNameQName)
public AssocChild(String childId, String prefixAssocTypeQName)
{
super(prefixAssocTypeQName);
this.childId = childId;
this.prefixAssocChildQName = prefixAssocNameQName;
}
public String getChildQName()
{
return prefixAssocChildQName;
}
public void setChildQName(String prefixAssocChildQName)
{
this.prefixAssocChildQName = prefixAssocChildQName;
}
public Boolean getIsPrimaryParent()