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

127568 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126104 jvonka: Node (Peer) Associations - initial wip
      - /nodes/{srcId}/targets (GET, POST)
      - /nodes/{srcId}/targets/{tgtId} (DELETE)
      - /nodes/{tgtId}/sources (GET)
      - TODO ... assoc tests !
      - RA-742, RA-918, RA-919


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

source/java/org/alfresco/rest/api/model/Assoc.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2005-2016 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.rest.api.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.rest.framework.resource.UniqueId;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.NoSuchPersonException;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.EqualsHelper;
+import org.apache.chemistry.opencmis.commons.data.PropertyData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author janv
+ */
+public class Assoc
+{
+    private String prefixAssocTypeQName;
+
+    public Assoc()
+    {
+    }
+
+    public Assoc(String prefixAssocTypeQName)
+    {
+        this.prefixAssocTypeQName = prefixAssocTypeQName;
+    }
+
+    public String getAssocType()
+    {
+        return prefixAssocTypeQName;
+    }
+
+    public void setAssocType(String prefixAssocTypeQName)
+    {
+        this.prefixAssocTypeQName = prefixAssocTypeQName;
+    }
+}

source/java/org/alfresco/rest/api/model/AssocTarget.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2005-2016 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.rest.api.model;
+
+/**
+ * @author janv
+ */
+public class AssocTarget extends Assoc
+{
+    private String targetId;
+
+    public AssocTarget()
+    {
+    }
+
+    public AssocTarget(String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+    }
+
+    public AssocTarget(String targetId, String prefixAssocTypeQName)
+    {
+        super(prefixAssocTypeQName);
+
+        this.targetId = targetId;
+    }
+
+    public String getTargetId()
+    {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId)
+    {
+        this.targetId = targetId;
+    }
+}

source/java/org/alfresco/rest/api/model/Node.java

@@ -425,6 +425,21 @@ public class Node implements Comparable<Node>
         return this.contentInfo;
     }
 
+    // when appropriate, can be used to show association (in the context of a listing), for example
+    // GET /nodes/parentId/children, /nodes/parentId/secondary-children, /nodes/childId/parents
+    // GET /nodes/sourceId/targets, /nodes/targetId/sources
+    protected Assoc association;
+
+    public Assoc getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Assoc association)
+    {
+        this.association = association;
+    }
+
 
     // TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)