inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126491 jkaabimofrad: 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/BRANCHES/DEV/5.2.N/root@126835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:44:17 +00:00
parent c3c4692c2c
commit c55515cb10
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
View File

@@ -30,6 +30,7 @@ import org.alfresco.rest.api.model.ContentInfo;
import org.alfresco.rest.api.model.QuickShareLink; import org.alfresco.rest.api.model.QuickShareLink;
import org.alfresco.rest.api.model.QuickShareLinkEmailRequest; import org.alfresco.rest.api.model.QuickShareLinkEmailRequest;
import org.alfresco.rest.api.model.UserInfo; 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.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.core.exceptions.NotFoundException; import org.alfresco.rest.framework.core.exceptions.NotFoundException;
@@ -58,9 +59,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* Centralises access to quick share services and maps between representations. * Centralises access to shared link (public "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) ?
* *
* @author janv * @author janv
* @author Jamal Kaabi-Mofrad * @author Jamal Kaabi-Mofrad
@@ -367,7 +366,7 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
{ {
if (!enabled) if (!enabled)
{ {
throw new NotFoundException(DISABLED); throw new DisabledServiceException(DISABLED);
} }
} }