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

127528 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125406 jvonka: RA-779 / RA-780: Sites API - initial commit for create site [default/functional Share site ;-)] & delete site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/Sites.java

@@ -1,4 +1,4 @@
-/*
+/*
  * #%L
  * Alfresco Remote API
  * %%
@@ -9,20 +9,20 @@
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api;
 
 import org.alfresco.query.PagingResults;
@@ -43,6 +43,8 @@ public interface Sites
 	SiteInfo validateSite(NodeRef nodeRef);
     CollectionWithPagingInfo<SiteMember> getSiteMembers(String siteShortName, Parameters parameters);
     Site getSite(String siteId);
+	void deleteSite(String siteId, Parameters parameters);
+    Site createSite(Site site);
     
 	/**
 	 * people/<personId>/sites/<siteId>
@@ -67,4 +69,6 @@ public interface Sites
     
     String getSiteRole(String siteId);
     String getSiteRole(String siteId, String personId);
+
+    String PARAM_PERMANENT = "permanent";
 }

source/java/org/alfresco/rest/api/impl/FavouritesImpl.java

@@ -1,4 +1,4 @@
-/*
+/*
  * #%L
  * Alfresco Remote API
  * %%
@@ -9,20 +9,20 @@
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
  * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.impl;
 
 import java.util.AbstractList;
@@ -47,7 +47,6 @@ import org.alfresco.rest.api.model.Favourite;
 import org.alfresco.rest.api.model.Folder;
 import org.alfresco.rest.api.model.FolderTarget;
 import org.alfresco.rest.api.model.Site;
-import org.alfresco.rest.api.model.SiteImpl;
 import org.alfresco.rest.api.model.SiteTarget;
 import org.alfresco.rest.api.model.Target;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -60,6 +59,7 @@ import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerC
 import org.alfresco.service.cmr.favourites.FavouritesService;
 import org.alfresco.service.cmr.favourites.FavouritesService.Type;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.util.Pair;
@@ -126,7 +126,7 @@ public class FavouritesImpl implements Favourites
 		{
 			SiteInfo siteInfo = siteService.getSite(nodeRef);
 			String role = sites.getSiteRole(siteInfo.getShortName());
-			Site site = new SiteImpl(siteInfo, role);
+			Site site = new Site(siteInfo, role);
 			target = new SiteTarget(site);
 		}
 		else
@@ -189,8 +189,8 @@ public class FavouritesImpl implements Favourites
     	else if(target instanceof SiteTarget)
     	{
     		SiteTarget siteTarget = (SiteTarget)target;
-    		NodeRef guid = siteTarget.getSite().getGuid();
-    		SiteInfo siteInfo = sites.validateSite(guid);
+    		String guid = siteTarget.getSite().getGuid();
+    		SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid));
     		NodeRef siteNodeRef = siteInfo.getNodeRef();
     		String siteId = siteInfo.getShortName();
 

source/java/org/alfresco/rest/api/impl/SitesImpl.java

@@ -1,4 +1,4 @@
-/*
+/*
  * #%L
  * Alfresco Remote API
  * %%
@@ -9,20 +9,20 @@
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.impl;
 
 import java.io.Serializable;
@@ -57,7 +57,6 @@ import org.alfresco.rest.api.model.FavouriteSite;
 import org.alfresco.rest.api.model.MemberOfSite;
 import org.alfresco.rest.api.model.Site;
 import org.alfresco.rest.api.model.SiteContainer;
-import org.alfresco.rest.api.model.SiteImpl;
 import org.alfresco.rest.api.model.SiteMember;
 import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
@@ -76,9 +75,18 @@ import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.preference.PreferenceService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.view.ImportPackageHandler;
+import org.alfresco.service.cmr.view.ImporterBinding;
+import org.alfresco.service.cmr.view.ImporterContentCache;
+import org.alfresco.service.cmr.view.ImporterProgress;
+import org.alfresco.service.cmr.view.ImporterService;
+import org.alfresco.service.cmr.view.Location;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -87,6 +95,7 @@ import org.apache.commons.logging.LogFactory;
  * Centralises access to site services and maps between representations.
  * 
  * @author steveglover
+ * @author janv
  * @since publicapi1.0
  */
 public class SitesImpl implements Sites
@@ -102,6 +111,8 @@ public class SitesImpl implements Sites
     protected SiteService siteService;
     protected FavouritesService favouritesService;
     protected PreferenceService preferenceService;
+    protected ImporterService importerService;
+    protected SiteSurfConfig siteSurfConfig;
 
     public void setPreferenceService(PreferenceService preferenceService)
     {
@@ -138,6 +149,16 @@ public class SitesImpl implements Sites
         this.siteService = siteService;
     }
 
+    public void setImporterService(ImporterService importerService)
+    {
+        this.importerService = importerService;
+    }
+
+    public void setSiteSurfConfig(SiteSurfConfig siteSurfConfig)
+    {
+        this.siteSurfConfig = siteSurfConfig;
+    }
+
     public SiteInfo validateSite(NodeRef guid)
     {
         SiteInfo siteInfo = null;
@@ -241,7 +262,7 @@ public class SitesImpl implements Sites
         {
             role = getSiteRole(siteId);
         }
-        return new SiteImpl(siteInfo, role);
+        return new Site(siteInfo, role);
     }
     
     /**
@@ -268,7 +289,7 @@ public class SitesImpl implements Sites
         String roleStr = siteService.getMembersRole(siteInfo.getShortName(), personId);
         if(roleStr != null)
         {
-            SiteImpl site = new SiteImpl(siteInfo, roleStr);
+            Site site = new Site(siteInfo, roleStr);
             siteMember = new MemberOfSite(site.getId(), siteInfo.getNodeRef(), roleStr);
         }
         else
@@ -604,7 +625,7 @@ public class SitesImpl implements Sites
         List<Site> page = new AbstractList<Site>()
         {
             @Override
-            public SiteImpl get(int index)
+            public Site get(int index)
             {
                 SiteInfo siteInfo = sites.get(index);
 
@@ -613,7 +634,7 @@ public class SitesImpl implements Sites
                 {
                     role = siteService.getMembersRole(siteInfo.getShortName(), personId);
                 }
-                return new SiteImpl(siteInfo, role);
+                return new Site(siteInfo, role);
             }
 
             @Override
@@ -811,4 +832,146 @@ public class SitesImpl implements Sites
 
         return CollectionWithPagingInfo.asPaged(paging, favourites, favouriteSites.hasMoreItems(), favouriteSites.getTotalResultCount().getFirst());
     }
+
+    public void deleteSite(String siteId, Parameters parameters)
+    {
+        SiteInfo siteInfo = validateSite(siteId);
+        if(siteInfo == null)
+        {
+            // site does not exist
+            throw new EntityNotFoundException(siteId);
+        }
+        siteId = siteInfo.getShortName();
+
+        // default false (if not provided)
+        boolean permanentDelete = Boolean.valueOf(parameters.getParameter(PARAM_PERMANENT));
+
+        if (permanentDelete == true)
+        {
+            // Set as temporary to delete node instead of archiving.
+            nodeService.addAspect(siteInfo.getNodeRef(), ContentModel.ASPECT_TEMPORARY, null);
+        }
+
+        siteService.deleteSite(siteId);
+    }
+
+    // based on Share create site
+    private static final int SITE_MAXLEN_ID = 72;
+    private static final int SITE_MAXLEN_TITLE = 256;
+    private static final int SITE_MAXLEN_DESCRIPTION = 512;
+
+
+    /**
+     * Create default/preset (Share) site - with DocLib container/component
+     *
+     * @param site
+     * @return
+     */
+    public Site createSite(Site site)
+    {
+        site = validateSite(site);
+        String siteId = site.getId();
+
+        siteService.createSite("sitePreset", siteId, site.getTitle(), site.getDescription(), site.getVisibility());
+        importSite(siteId);
+
+        // pre-create doclib
+        siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
+
+        return getSite(siteId);
+    }
+
+    private Site validateSite(Site site)
+    {
+        // site title - mandatory
+        String siteTitle = site.getTitle();
+        if ((siteTitle == null) || siteTitle.isEmpty())
+        {
+            throw new InvalidArgumentException("Site title is expected: "+siteTitle);
+        }
+        else if (siteTitle.length() > SITE_MAXLEN_TITLE)
+        {
+            throw new InvalidArgumentException("Site title exceeds max length of "+SITE_MAXLEN_TITLE+" characters");
+        }
+
+        SiteVisibility siteVisibility = site.getVisibility();
+        if (siteVisibility == null)
+        {
+            throw new InvalidArgumentException("Site visibility is expected: "+siteTitle+" (eg. PUBLIC, PRIVATE, MODERATED)");
+        }
+
+        String siteId = site.getId();
+        if (siteId == null)
+        {
+            siteId = siteTitle.trim();
+            siteId = siteId.replace(" ","-");
+            siteId = siteId.replaceAll("[^A-Za-z0-9\\-]","");
+        }
+        else
+        {
+            if (! siteId.matches("[^A-Za-z0-9\\-]"))
+            {
+                throw new InvalidArgumentException("Invalid site id - should consist of alphanumeric/dash characters");
+            }
+        }
+
+        if (siteId.length() > SITE_MAXLEN_ID)
+        {
+            throw new InvalidArgumentException("Site id exceeds max length of "+SITE_MAXLEN_ID+ "characters");
+        }
+
+        site.setId(siteId);
+
+        String siteDescription = site.getDescription();
+        if ((siteDescription != null) && (siteDescription.length() > SITE_MAXLEN_DESCRIPTION))
+        {
+            throw new InvalidArgumentException("Site description exceeds max length of "+SITE_MAXLEN_DESCRIPTION+" characters");
+        }
+
+        return site;
+    }
+
+    private void importSite(final String siteId)
+    {
+        ImportPackageHandler acpHandler = new SiteImportPackageHandler(siteSurfConfig, siteId);
+        Location location = new Location(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        location.setPath("/app:company_home/st:sites/cm:" + ISO9075.encode(siteId));
+        ImporterBinding binding = new ImporterBinding()
+        {
+            @Override
+            public String getValue(String key)
+            {
+                if (key.equals("siteId"))
+                {
+                    return siteId;
+                }
+                return null;
+            }
+
+            @Override
+            public UUID_BINDING getUUIDBinding()
+            {
+                return UUID_BINDING.CREATE_NEW;
+            }
+
+            @Override
+            public QName[] getExcludedClasses()
+            {
+                return null;
+            }
+
+            @Override
+            public boolean allowReferenceWithinTransaction()
+            {
+                return false;
+            }
+
+            @Override
+            public ImporterContentCache getImportConentCache()
+            {
+                return null;
+            }
+        };
+        importerService.importView(acpHandler, location, binding, (ImporterProgress)null);
+    }
 }

source/java/org/alfresco/rest/api/model/FavouriteSite.java

@@ -1,4 +1,4 @@
-/*
+/*
  * #%L
  * Alfresco Remote API
  * %%
@@ -9,20 +9,20 @@
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.model;
 
 import org.alfresco.service.cmr.site.SiteInfo;
@@ -35,7 +35,7 @@ import org.alfresco.service.cmr.site.SiteInfo;
  * @author steveglover
  *
  */
-public class FavouriteSite extends SiteImpl
+public class FavouriteSite extends Site
 {
 	public FavouriteSite()
 	{

source/java/org/alfresco/rest/api/model/Site.java

@@ -1,4 +1,4 @@
-/*
+/*
  * #%L
  * Alfresco Remote API
  * %%
@@ -9,23 +9,24 @@
  * the paid license agreement will prevail.  Otherwise, the software is 
  * provided under the following open source license terms:
  * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.rest.api.model;
 
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteVisibility;
 
 /**
@@ -34,15 +35,139 @@ import org.alfresco.service.cmr.site.SiteVisibility;
  * @author steveglover
  *
  */
-public interface Site
+public class Site implements Comparable<Site>
 {
 	public static final String ROLE = "role";
 
-	String getId();
-	void setId(String id);
-	NodeRef getGuid();
-	String getTitle();
-	String getDescription();
-	SiteVisibility getVisibility();
-	String getRole();
+	protected String id; // site id (aka short name)
+	protected String guid; // site nodeId
+	protected String title;
+	protected String description;
+
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+
+	public void setDescription(String description)
+	{
+		this.description = description;
+	}
+
+	public void setVisibility(SiteVisibility visibility)
+	{
+		this.visibility = visibility;
+	}
+
+	public void setRole(String role)
+	{
+		this.role = role;
+	}
+
+	protected SiteVisibility visibility;
+	protected String role;
+	
+	public Site()
+	{
+	}
+	
+	public Site(SiteInfo siteInfo, String role)
+	{
+		if(siteInfo == null)
+		{
+			throw new IllegalArgumentException("Must provide siteInfo");
+		}
+		this.id = siteInfo.getShortName();
+		this.guid = siteInfo.getNodeRef().getId();
+		this.title = siteInfo.getTitle();
+		this.description = siteInfo.getDescription();
+		this.visibility = siteInfo.getVisibility();
+		this.role = role;
+	}
+
+	public String getId()
+	{
+		return id;
+	}
+	
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+	
+	public String getGuid()
+	{
+		return guid;
+	}
+
+	public void setGuid(String guid)
+	{
+		this.guid = guid;
+	}
+
+	public String getTitle()
+	{
+		return title;
+	}
+
+	public String getDescription()
+	{
+		return description;
+	}
+
+	public SiteVisibility getVisibility()
+	{
+		return visibility;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj == null)
+		{
+			return false;
+		}
+		
+		if (getClass() != obj.getClass())
+		{
+			return false;
+		}
+		
+		Site other = (Site) obj;
+		return id.equals(other.id);
+	}
+
+	@Override
+	public int compareTo(Site site)
+	{
+		return id.compareTo(site.getId());
+	}
+
+    @Override
+	public int hashCode()
+    {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public String toString()
+	{
+		return "Site [id=" + id + ", guid=" + guid + ", title=" + title
+				+ ", description=" + description + ", visibility=" + visibility
+				+ "]";
+	}
+
+	public String getRole()
+	{
+		return role;
+	}
 }

source/java/org/alfresco/rest/api/model/SiteImpl.java

@@ -1,153 +0,0 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.api.model;
-
-import org.alfresco.rest.framework.resource.UniqueId;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteVisibility;
-
-/**
- * Represents a site.
- * 
- * @author steveglover
- *
- */
-public class SiteImpl implements Site, Comparable<SiteImpl>
-{
-	protected String id;
-	protected NodeRef guid;
-	protected String title;
-	protected String description;
-	protected SiteVisibility visibility;
-	protected String role;
-	
-	public SiteImpl()
-	{
-	}
-	
-	public SiteImpl(SiteInfo siteInfo, String role)
-	{
-		if(siteInfo == null)
-		{
-			throw new IllegalArgumentException("Must provide siteInfo");
-		}
-		this.id = siteInfo.getShortName();
-		this.guid = siteInfo.getNodeRef();
-		this.title = siteInfo.getTitle();
-		this.description = siteInfo.getDescription();
-		this.visibility = siteInfo.getVisibility();
-		this.role = role;
-	}
-
-	@UniqueId
-	public String getId()
-	{
-		return id;
-	}
-	
-	public void setId(String id)
-	{
-		this.id = id;
-	}
-	
-	public NodeRef getGuid()
-	{
-		return guid;
-	}
-
-	public void setGuid(NodeRef guid)
-	{
-		this.guid = guid;
-	}
-
-	public String getTitle()
-	{
-		return title;
-	}
-
-	public String getDescription()
-	{
-		return description;
-	}
-
-	public SiteVisibility getVisibility()
-	{
-		return visibility;
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-		{
-			return true;
-		}
-		
-		if (obj == null)
-		{
-			return false;
-		}
-		
-		if (getClass() != obj.getClass())
-		{
-			return false;
-		}
-		
-		SiteImpl other = (SiteImpl) obj;
-		return id.equals(other.id);
-	}
-
-	@Override
-	public int compareTo(SiteImpl site)
-	{
-		return id.compareTo(site.getId());
-	}
-
-    @Override
-	public int hashCode()
-    {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((id == null) ? 0 : id.hashCode());
-		return result;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "Site [id=" + id + ", guid=" + guid + ", title=" + title
-				+ ", description=" + description + ", visibility=" + visibility
-				+ "]";
-	}
-
-	@Override
-	public String getRole()
-	{
-		return role;
-	}
-}

source/java/org/alfresco/rest/api/sites/SiteEntityResource.java

@@ -28,6 +28,7 @@ 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.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.resource.EntityResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
@@ -35,6 +36,9 @@ import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.util.ParameterCheck;
 import org.springframework.beans.factory.InitializingBean;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * An implementation of an Entity Resource for a Site
  *
@@ -42,7 +46,9 @@ import org.springframework.beans.factory.InitializingBean;
  * @author steveglover
  */
 @EntityResource(name="sites", title = "Sites")
-public class SiteEntityResource implements EntityResourceAction.Read<Site>, EntityResourceAction.ReadById<Site>, InitializingBean
+public class SiteEntityResource implements EntityResourceAction.Read<Site>,
+        EntityResourceAction.ReadById<Site>, EntityResourceAction.Delete,
+        EntityResourceAction.Create<Site>, InitializingBean
 {
     private Sites sites;
 
@@ -79,4 +85,35 @@ public class SiteEntityResource implements EntityResourceAction.Read<Site>, Enti
         return sites.getSite(siteId);
     }
 
+    /**
+     * Delete the given site.
+     *
+     * @param siteId String id of site.
+     */
+    @Override
+    @WebApiDescription(title = "Delete Site", description="Delete the site. This will cascade delete")
+    public void delete(String siteId, Parameters parameters)
+    {
+        sites.deleteSite(siteId, parameters);
+    }
+
+    /**
+     *
+     * @param entity
+     * @param parameters
+     * @return
+     */
+    @Override
+    @WebApiDescription(title="Create site", description="Create the default/functional Share site")
+    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);
+        result.add(sites.createSite(entity.get(0)));
+        return result;
+    }
 }