From 6e95bdf9c649fea94fe1c96590b547a7db5eaaac Mon Sep 17 00:00:00 2001
From: cturlica <cristian.turlica@ness.com>
Date: Wed, 17 Jun 2020 10:21:25 +0300
Subject: [PATCH] ACS-306: ACS Repository: V1 Rest API for content direct
 access urls    - change expiryTime type to long    - updated alfresco data
 model version

---
 pom.xml                                                         | 2 +-
 src/main/java/org/alfresco/repo/content/ContentServiceImpl.java | 2 +-
 .../org/alfresco/service/cmr/repository/ContentService.java     | 2 +-
 .../java/org/alfresco/repo/version/ContentServiceImplTest.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 390f575f87..080882e6b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
         <maven.build.sourceVersion>11</maven.build.sourceVersion>
 
-        <dependency.alfresco-data-model.version>8.122</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.124</dependency.alfresco-data-model.version>
         <dependency.alfresco-core.version>8.35</dependency.alfresco-core.version>
 
         <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>
diff --git a/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java b/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
index 6fb75ca167..374b0fe7f2 100644
--- a/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -509,7 +509,7 @@ public class ContentServiceImpl extends ContentTransformServiceAdaptor implement
     }
 
     @Override
-    public String getDirectAccessUrl(NodeRef nodeRef, int expiryTime)
+    public String getDirectAccessUrl(NodeRef nodeRef, long expiryTime)
     {
         ContentData contentData = getContentData(nodeRef, ContentModel.PROP_CONTENT);
 
diff --git a/src/main/java/org/alfresco/service/cmr/repository/ContentService.java b/src/main/java/org/alfresco/service/cmr/repository/ContentService.java
index 549c155b83..99dee46abf 100644
--- a/src/main/java/org/alfresco/service/cmr/repository/ContentService.java
+++ b/src/main/java/org/alfresco/service/cmr/repository/ContentService.java
@@ -167,5 +167,5 @@ public interface ContentService extends ContentTransformService
      *         no binary content for the node or empty string if not supported
      */
     @Auditable(parameters = {"nodeRef", "expiryTime"})
-    public String getDirectAccessUrl(NodeRef nodeRef, int expiryTime);
+    public String getDirectAccessUrl(NodeRef nodeRef, long expiryTime);
 }
diff --git a/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java b/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
index 6da5fb5c4f..affec5af72 100644
--- a/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/version/ContentServiceImplTest.java
@@ -190,7 +190,7 @@ public class ContentServiceImplTest extends BaseVersionStoreTest
     public void testWhenGetDirectAccessUrlIsNotSupported()
     {
         NodeRef versionableNode = createNewVersionableNode();
-        assertEquals("", contentService.getDirectAccessUrl(versionableNode, 10));
+        assertEquals("", contentService.getDirectAccessUrl(versionableNode, 10L));
         assertFalse(contentStore.isDirectAccessSupported());
     }