ACS-304 : ACS Repository: support for content direct access urls (#1042)

- add expiry parameter
This commit is contained in:
Denis Ungureanu
2020-06-11 15:49:46 +03:00
committed by GitHub
parent 091b2db393
commit 924122b3d9
4 changed files with 8 additions and 6 deletions

View File

@@ -36,7 +36,7 @@
<maven.build.sourceVersion>11</maven.build.sourceVersion> <maven.build.sourceVersion>11</maven.build.sourceVersion>
<dependency.alfresco-data-model.version>8.118</dependency.alfresco-data-model.version> <dependency.alfresco-data-model.version>8.119</dependency.alfresco-data-model.version>
<dependency.alfresco-core.version>8.35</dependency.alfresco-core.version> <dependency.alfresco-core.version>8.35</dependency.alfresco-core.version>
<dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version> <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>

View File

@@ -503,11 +503,11 @@ public class ContentServiceImpl extends ContentTransformServiceAdaptor implement
} }
@Override @Override
public String getDirectAccessUrl(String contentUrl) public String getDirectAccessUrl(String contentUrl, int expiryTime)
{ {
if (store.isDirectAccessSupported()) if (store.isDirectAccessSupported())
{ {
return store.getDirectAccessUrl(contentUrl); return store.getDirectAccessUrl(contentUrl, expiryTime);
} }
return ""; return "";
} }

View File

@@ -154,10 +154,12 @@ public interface ContentService extends ContentTransformService
public ContentWriter getTempWriter(); public ContentWriter getTempWriter();
/** /**
* Gets a presigned URL to directly access a binary content. * Gets a presigned URL to directly access a binary content. It is up to the content store
* if it can fulfil this request with an expiry time or not.
* *
* @param contentUrl A content store URL * @param contentUrl A content store URL
* @param expiryTime Expiration time in milliseconds
* @return A direct access URL for a binary content or empty string if not supported * @return A direct access URL for a binary content or empty string if not supported
*/ */
public String getDirectAccessUrl(String contentUrl); public String getDirectAccessUrl(String contentUrl, int expiryTime);
} }

View File

@@ -189,7 +189,7 @@ public class ContentServiceImplTest extends BaseVersionStoreTest
@Test @Test
public void testWhenGetDirectAccessUrlIsNotSupported() public void testWhenGetDirectAccessUrlIsNotSupported()
{ {
assertEquals("", contentService.getDirectAccessUrl("s3v2://1234421")); assertEquals("", contentService.getDirectAccessUrl("s3v2://1234421", 10));
assertFalse(contentStore.isDirectAccessSupported()); assertFalse(contentStore.isDirectAccessSupported());
} }