From 7e1a657cd0e741609741c2e22908ef205fa515a5 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 3 Jun 2016 14:14:53 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 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 --- .../org/alfresco/rest/api/model/AssocChild.java | 14 +++++++------- .../rest/api/tests/NodeAssociationsApiTest.java | 16 ++++++++-------- .../rest/api/tests/client/data/Association.java | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source/java/org/alfresco/rest/api/model/AssocChild.java b/source/java/org/alfresco/rest/api/model/AssocChild.java index c102a31e44..fe8fa3b873 100644 --- a/source/java/org/alfresco/rest/api/model/AssocChild.java +++ b/source/java/org/alfresco/rest/api/model/AssocChild.java @@ -24,17 +24,17 @@ package org.alfresco.rest.api.model; public class AssocChild extends Assoc { private String childId; - private Boolean isPrimaryParent; + private Boolean isPrimary; public AssocChild() { } - public AssocChild(String prefixAssocTypeQName, boolean isPrimaryParent) + public AssocChild(String prefixAssocTypeQName, boolean isPrimary) { super(prefixAssocTypeQName); - this.isPrimaryParent = isPrimaryParent; + this.isPrimary = isPrimary; } public AssocChild(String childId, String prefixAssocTypeQName) @@ -44,14 +44,14 @@ public class AssocChild extends Assoc 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() diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java index 04578ea03c..2a42cb835d 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeAssociationsApiTest.java @@ -513,7 +513,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest assertEquals(1, nodes.size()); assertEquals(f2Id, nodes.get(0).getId()); 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 AssocChild secChild = new AssocChild(o2Id, ASSOC_TYPE_CM_CONTAINS); @@ -540,7 +540,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest i++; } assertEquals(o2Id, node.getId()); - assertFalse(nodeAssoc.getIsPrimaryParent()); + assertFalse(nodeAssoc.getIsPrimary()); } assertEquals(2, i); @@ -555,7 +555,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest if (nodeId.equals(f2Id)) { assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); - assertTrue(nodeAssoc.getIsPrimaryParent()); + assertTrue(nodeAssoc.getIsPrimary()); i++; } else if (nodeId.equals(f1Id)) @@ -568,7 +568,7 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest { i++; } - assertFalse(nodeAssoc.getIsPrimaryParent()); + assertFalse(nodeAssoc.getIsPrimary()); } } assertEquals(3, i); @@ -594,13 +594,13 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest if (nodeId.equals(f2Id)) { assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); - assertTrue(nodeAssoc.getIsPrimaryParent()); + assertTrue(nodeAssoc.getIsPrimary()); i++; } else if (nodeId.equals(f1Id)) { assertEquals(ASSOC_TYPE_CM_CONTAINS, nodeAssoc.getAssocType()); - assertFalse(nodeAssoc.getIsPrimaryParent()); + assertFalse(nodeAssoc.getIsPrimary()); i++; } } @@ -614,14 +614,14 @@ public class NodeAssociationsApiTest extends AbstractBaseApiTest assertEquals(1, nodes.size()); assertEquals(o2Id, nodes.get(0).getId()); 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); nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class); assertEquals(1, nodes.size()); assertEquals(f1Id, nodes.get(0).getId()); 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); diff --git a/source/test-java/org/alfresco/rest/api/tests/client/data/Association.java b/source/test-java/org/alfresco/rest/api/tests/client/data/Association.java index a8c8fb671f..13387e256c 100644 --- a/source/test-java/org/alfresco/rest/api/tests/client/data/Association.java +++ b/source/test-java/org/alfresco/rest/api/tests/client/data/Association.java @@ -34,15 +34,15 @@ public class Association } // 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; } }