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

136708 jkaabimofrad: Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      136574 jkaabimofrad: APPSREPO-179: Added an optional "include=path" parameter to the "list shared links" API.


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

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -51,14 +51,13 @@ public class QuickShareLink
     private Date expiresAt;
 
     private String nodeId;
-
     private String name;
+    private PathInfo pathInfo;
 
     private ContentInfo content;
 
     private Date modifiedAt;
     private UserInfo modifiedByUser;
-
     private UserInfo sharedByUser;
 
     private List<String> allowableOperations;
@@ -120,6 +119,16 @@ public class QuickShareLink
         this.name = name;
     }
 
+    public PathInfo getPathInfo()
+    {
+        return pathInfo;
+    }
+
+    public void setPathInfo(PathInfo pathInfo)
+    {
+        this.pathInfo = pathInfo;
+    }
+
     public Date getModifiedAt()
     {
         return modifiedAt;
@@ -168,6 +177,7 @@ public class QuickShareLink
         sb.append("QuickShareLink [id=").append(getId());
         sb.append(", nodeId=").append(getNodeId());
         sb.append(", name=").append(getName());
+        sb.append(", pathInfo=").append(getPathInfo());
         sb.append(", modifiedAt=").append(getModifiedAt());
         sb.append(", modifiedByUser=").append(getModifiedByUser());
         sb.append(", sharedByUser=").append(getSharedByUser());