Merged 5.2.0 (5.2.0) to HEAD (5.2)

133904 msuzuki: ACE-5622, merge fix from 5.2.N to address search rest api fix for location field


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/DeletedNodes.java

@@ -27,10 +27,13 @@ package org.alfresco.rest.api;
 
 import org.alfresco.repo.node.archive.RestoreNodeReport;
 import org.alfresco.rest.api.model.Node;
+import org.alfresco.rest.api.model.UserInfo;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.service.cmr.repository.NodeRef;
 
+import java.util.Map;
+
 /**
  * Handles trashcan / deleted nodes
  *
@@ -38,8 +41,33 @@ import org.alfresco.service.cmr.repository.NodeRef;
  */
 public interface DeletedNodes
 {
+    /**
+     * Lists deleted nodes using a ArchivedNodesCannedQuery
+     * @param parameters
+     * @return Collection of deleted Nodes
+     */
     CollectionWithPagingInfo<Node> listDeleted(Parameters parameters);
-    Node getDeletedNode(String originalId, Parameters parameters);
+
+    /**
+     * Gets a single deleted node by id.
+     * @param originalId
+     * @param parameters
+     * @param fullnode Should we return the full representation of the minimal one?
+     * @param mapUserInfo
+     * @return a deleted node
+     */
+    Node getDeletedNode(String originalId, Parameters parameters, boolean fullnode, Map<String, UserInfo> mapUserInfo);
+
+    /**
+     * Restores a deleted node and returns it.
+     * @param archivedId
+     * @return the new undeleted node.
+     */
     Node restoreArchivedNode(String archivedId);
+
+    /**
+     * Permanently delete the node.
+     * @param archivedId
+     */
     void purgeArchivedNode(String archivedId);
 }