inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
127581 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126681 jvonka: Node Associations - child assocs
      - in responses return isPrimary (rather than isPrimaryParent)
      - RA-920, RA-930, RA-634


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:14:53 +00:00
parent 50af2e5cc1
commit 7e1a657cd0
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/rest/api/model/AssocChild.java
View File

@@ -24,17 +24,17 @@ package org.alfresco.rest.api.model;
public class AssocChild extends Assoc public class AssocChild extends Assoc
{ {
private String childId; private String childId;
private Boolean isPrimaryParent; private Boolean isPrimary;
public AssocChild() public AssocChild()
{ {
} }
public AssocChild(String prefixAssocTypeQName, boolean isPrimaryParent) public AssocChild(String prefixAssocTypeQName, boolean isPrimary)
{ {
super(prefixAssocTypeQName); super(prefixAssocTypeQName);
this.isPrimaryParent = isPrimaryParent; this.isPrimary = isPrimary;
} }
public AssocChild(String childId, String prefixAssocTypeQName) public AssocChild(String childId, String prefixAssocTypeQName)
@@ -44,14 +44,14 @@ public class AssocChild extends Assoc
this.childId = childId; this.childId = childId;
} }
public Boolean getIsPrimaryParent() public Boolean getIsPrimary()
{ {
return isPrimaryParent; return isPrimary;
} }
public void setIsPrimaryParent(Boolean isPrimaryParent) public void setIsPrimary(Boolean isPrimary)
{ {
this.isPrimaryParent = isPrimaryParent; this.isPrimary = isPrimary;
} }
public String getChildId() public String getChildId()

16
source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java
View File

@@ -513,7 +513,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
assertEquals(1, nodes.size()); assertEquals(1, nodes.size());
assertEquals(f2Id, nodes.get(0).getId()); assertEquals(f2Id, nodes.get(0).getId());
assertEquals(ASSOC_TYPE_CM_CONTAINS, nodes.get(0).getAssociation().getAssocType()); assertEquals(ASSOC_TYPE_CM_CONTAINS, nodes.get(0).getAssociation().getAssocType());
assertTrue(nodes.get(0).getAssociation().getIsPrimaryParent()); assertTrue(nodes.get(0).getAssociation().getIsPrimary());
// create secondary child assoc // create secondary child assoc
AssocChild secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS); AssocChild secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS);
@@ -540,7 +540,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
i++; i++;
} }
assertEquals(o2Id, node.getId()); assertEquals(o2Id, node.getId());
assertFalse(nodeAssoc.getIsPrimaryParent()); assertFalse(nodeAssoc.getIsPrimary());
} }
assertEquals(2, i); assertEquals(2, i);
@@ -555,7 +555,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
if (nodeId.equals(f2Id)) if (nodeId.equals(f2Id))
{ {
assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
assertTrue(nodeAssoc.getIsPrimaryParent()); assertTrue(nodeAssoc.getIsPrimary());
i++; i++;
} }
else if (nodeId.equals(f1Id)) else if (nodeId.equals(f1Id))
@@ -568,7 +568,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
{ {
i++; i++;
} }
assertFalse(nodeAssoc.getIsPrimaryParent()); assertFalse(nodeAssoc.getIsPrimary());
} }
} }
assertEquals(3, i); assertEquals(3, i);
@@ -594,13 +594,13 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
if (nodeId.equals(f2Id)) if (nodeId.equals(f2Id))
{ {
assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
assertTrue(nodeAssoc.getIsPrimaryParent()); assertTrue(nodeAssoc.getIsPrimary());
i++; i++;
} }
else if (nodeId.equals(f1Id)) else if (nodeId.equals(f1Id))
{ {
assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType());
assertFalse(nodeAssoc.getIsPrimaryParent()); assertFalse(nodeAssoc.getIsPrimary());
i++; i++;
} }
} }
@@ -614,14 +614,14 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest
assertEquals(1, nodes.size()); assertEquals(1, nodes.size());
assertEquals(o2Id, nodes.get(0).getId()); assertEquals(o2Id, nodes.get(0).getId());
assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType()); assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType());
assertFalse(nodes.get(0).getAssociation().getIsPrimaryParent()); assertFalse(nodes.get(0).getAssociation().getIsPrimary());
response = getAll(getNodeParentsUrl(o2Id), user1, paging, params, 200); response = getAll(getNodeParentsUrl(o2Id), user1, paging, params, 200);
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class); nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
assertEquals(1, nodes.size()); assertEquals(1, nodes.size());
assertEquals(f1Id, nodes.get(0).getId()); assertEquals(f1Id, nodes.get(0).getId());
assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType()); assertEquals(ASSOC_TYPE_CM_PREFERENCE_IMAGE, nodes.get(0).getAssociation().getAssocType());
assertFalse(nodes.get(0).getAssociation().getIsPrimaryParent()); assertFalse(nodes.get(0).getAssociation().getIsPrimary());
params = new HashMap<>(2); params = new HashMap<>(2);

10
source/test-java/org/alfresco/rest/api/tests/client/data/Association.java
View File

@@ -34,15 +34,15 @@ public class Association
} }
// child assoc // child assoc
private Boolean isPrimaryParent; private Boolean isPrimary;
public Boolean getIsPrimaryParent() public Boolean getIsPrimary()
{ {
return isPrimaryParent; return isPrimary;
} }
public void setIsPrimaryParent(Boolean isPrimaryParent) public void setIsPrimary(Boolean isPrimary)
{ {
this.isPrimaryParent = isPrimaryParent; this.isPrimary = isPrimary;
} }
} }