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

133081 jkaabimofrad: APPSREPO-61: First cut of automatic time expiry enhancement to the quick-sharing functionality.


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

source/java/org/alfresco/service/cmr/quickshare/QuickShareDTO.java

@@ -26,6 +26,7 @@
 package org.alfresco.service.cmr.quickshare;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Data transfer object for holding quick share information.
@@ -38,6 +39,7 @@ public class QuickShareDTO implements Serializable
     private static final long serialVersionUID = -2163618127531335360L;
 
     private String sharedId;
+    private Date expiresAt;
 
     /**
      * Default constructor
@@ -45,8 +47,14 @@ public class QuickShareDTO implements Serializable
      * @param sharedId The quick share id
      */
     public QuickShareDTO(String sharedId)
+    {
+        this(sharedId, null);
+    }
+
+    public QuickShareDTO(String sharedId, Date expiresAt)
     {
         this.sharedId = sharedId;
+        this.expiresAt = expiresAt;
     }
 
     /**
@@ -54,7 +62,7 @@ public class QuickShareDTO implements Serializable
      */
     public QuickShareDTO(QuickShareDTO from) 
     {
-        this(from.getId());
+        this(from.getId(), from.getExpiresAt());
     }
     
     /**
@@ -64,4 +72,9 @@ public class QuickShareDTO implements Serializable
     {
         return this.sharedId;
     }
+
+    public Date getExpiresAt()
+    {
+        return expiresAt;
+    }
 }