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

127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


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

source/test-java/org/alfresco/rest/api/tests/client/data/Node.java

@@ -25,6 +25,9 @@
  */
 package org.alfresco.rest.api.tests.client.data;
 
+import org.alfresco.rest.api.model.AssocChild;
+import org.alfresco.rest.api.model.AssocTarget;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -70,7 +73,10 @@ public class Node
 
     protected List<String> allowableOperations;
 
-    protected String relativePath; // optionally used in create node request
+    // please note: these are currently only used (optionally) for node create request
+    protected String relativePath;
+    protected List<AssocChild> secondaryChildren;
+    protected List<AssocTarget> targets;
 
     public Node()
     {
@@ -246,6 +252,7 @@ public class Node
         this.allowableOperations = allowableOperations;
     }
 
+
     public String getRelativePath()
     {
         return relativePath;
@@ -256,6 +263,27 @@ public class Node
         this.relativePath = relativePath;
     }
 
+    public List<AssocChild> getSecondaryChildren()
+    {
+        return secondaryChildren;
+    }
+
+    public void setSecondaryChildren(List<AssocChild> secondaryChildren)
+    {
+        this.secondaryChildren = secondaryChildren;
+    }
+
+    public List<AssocTarget> getTargets()
+    {
+        return targets;
+    }
+
+    public void setTargets(List<AssocTarget> targets)
+    {
+        this.targets = targets;
+    }
+
+
     // note: can be child or peer (latter has assocType only)
     protected Association association;