Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

133145 jkaabimofrad: APPSREPO-54: Added support to the quick-share V1 API to allow setting an optional expiry date when creating a shared link.
              - Also, fixed the overloaded shareContent method which was missed during code clean-up.


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

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

@@ -48,6 +48,8 @@ public class QuickShareLink
 	// unique short id (ie. shorter than a guid, 22 vs 36 chars)
 	private String sharedId;
 
+    private Date expiresAt;
+
 	private String nodeId;
 
 	private String name;
@@ -79,7 +81,17 @@ public class QuickShareLink
 		this.sharedId = sharedId;
 	}
 
-	public String getNodeId() {
+    public Date getExpiresAt()
+    {
+        return expiresAt;
+    }
+
+    public void setExpiresAt(Date expiresAt)
+    {
+        this.expiresAt = expiresAt;
+    }
+
+    public String getNodeId() {
 		return nodeId;
 	}
 
@@ -160,6 +172,7 @@ public class QuickShareLink
 		sb.append(", sharedByUser=").append(getSharedByUser());
 		sb.append(", content=").append(getContent());
 		sb.append(", allowableOperations=").append(getAllowableOperations());
+        sb.append(", expiresAt=").append(getExpiresAt());
 		sb.append("]");
 		return sb.toString();
 	}