inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
129160 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128460 jvonka: REPO-341: Minor fix to site creation to return generic error message, if try to create multiple sites in a single call.
      - also relates to REPO-874


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:11:34 +00:00
parent 6e49b00e89
commit 224629cec0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/rest/api/sites/SiteEntityResource.java
View File

@@ -28,6 +28,8 @@ package org.alfresco.rest.api.sites;
import org.alfresco.rest.api.Sites; import org.alfresco.rest.api.Sites;
import org.alfresco.rest.api.model.Site; import org.alfresco.rest.api.model.Site;
import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.WebApiDescription;
import org.alfresco.rest.framework.WebApiParam;
import org.alfresco.rest.framework.core.ResourceParameter;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.EntityResource; import org.alfresco.rest.framework.resource.EntityResource;
import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
@@ -107,13 +109,10 @@ public class SiteEntityResource implements EntityResourceAction.Read<Site>,
*/ */
@Override @Override
@WebApiDescription(title="Create site", description="Create the default/functional Share site") @WebApiDescription(title="Create site", description="Create the default/functional Share site")
@WebApiParam(name="entity", title="A single site", description="A single site, multiple sites are not supported.",
kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false)
public List<Site> create(List<Site> entity, Parameters parameters) public List<Site> create(List<Site> entity, Parameters parameters)
{ {
if (entity.size() != 1)
{
throw new InvalidArgumentException("Please specify one site entity only");
}
List<Site> result = new ArrayList<>(1); List<Site> result = new ArrayList<>(1);
result.add(sites.createSite(entity.get(0), parameters)); result.add(sites.createSite(entity.get(0), parameters));
return result; return result;