From 2a15a12eceefcb6440afcd73c754795cdec796c2 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:11:38 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 122637 jvonka: (Quick) Shared Links API - return 501 (instead of 404) as per updated A/Cs RA-733, RA-775, RA-750, RA-708 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/impl/QuickShareLinksImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java index c342ba6594..37dc8b1d32 100644 --- a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java +++ b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java @@ -30,6 +30,7 @@ import org.alfresco.rest.api.model.ContentInfo; import org.alfresco.rest.api.model.QuickShareLink; import org.alfresco.rest.api.model.QuickShareLinkEmailRequest; import org.alfresco.rest.api.model.UserInfo; +import org.alfresco.rest.framework.core.exceptions.DisabledServiceException; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.NotFoundException; @@ -58,9 +59,7 @@ import java.util.List; import java.util.Map; /** - * Centralises access to quick share services and maps between representations. - * - * TODO - if QuickShare is disabled should we return 403 (as below) or 404 (eg. when accessing a link) ? + * Centralises access to shared link (public "quick share") services and maps between representations. * * @author janv * @author Jamal Kaabi-Mofrad @@ -367,7 +366,7 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean { if (!enabled) { - throw new NotFoundException(DISABLED); + throw new DisabledServiceException(DISABLED); } }