From 224629cec0068fd152deb377df7ae7aee3864214 Mon Sep 17 00:00:00 2001 From: Alexandru Epure Date: Tue, 9 Aug 2016 14:11:34 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 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 --- .../org/alfresco/rest/api/sites/SiteEntityResource.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java b/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java index 6e5bd05787..f2a82433c9 100644 --- a/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java +++ b/source/java/org/alfresco/rest/api/sites/SiteEntityResource.java @@ -28,6 +28,8 @@ package org.alfresco.rest.api.sites; import org.alfresco.rest.api.Sites; import org.alfresco.rest.api.model.Site; 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.resource.EntityResource; import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction; @@ -107,13 +109,10 @@ public class SiteEntityResource implements EntityResourceAction.Read, */ @Override @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 create(List entity, Parameters parameters) { - if (entity.size() != 1) - { - throw new InvalidArgumentException("Please specify one site entity only"); - } - List result = new ArrayList<>(1); result.add(sites.createSite(entity.get(0), parameters)); return result;