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

Merged V3.1 to HEAD

Browse Source 
13034: Performance improvements to SiteService listSites(username) method.
          Removal of some non-sensical javascript.
          ***NOTE: Unable to apply critical 3.1E SiteService performance improvements due to HEAD changes ***
   13036: Site Favorites restored to working order. If the user does not have any site favorite prefs then API call to retrieve the user sites list is avoided and exceptions are no longer produced and ignored.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-03-11 10:10:43 +00:00
parent 2c563871d8
commit 205b7b7697
1 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.repo.site;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -74,6 +75,8 @@ import org.json.JSONObject;
*/ */
public class SiteServiceImpl implements SiteService, SiteModel public class SiteServiceImpl implements SiteService, SiteModel
{ {
private static final String GROUP_SITE_PREFIX = PermissionService.GROUP_PREFIX + "site_";
/** Logger */ /** Logger */
private static Log logger = LogFactory.getLog(SiteServiceImpl.class); private static Log logger = LogFactory.getLog(SiteServiceImpl.class);
@@ -364,6 +367,26 @@ public class SiteServiceImpl implements SiteService, SiteModel
return siteInfo; return siteInfo;
} }
/**
* Gets a map containing the site's custom properties
*
* @return Map<QName, Serializable> map containing the custom properties of the site
*/
private Map<QName, Serializable> getSiteCustomProperties(Map<QName, Serializable> properties)
{
Map<QName, Serializable> customProperties = new HashMap<QName, Serializable>(4);
for (Map.Entry<QName, Serializable> entry : properties.entrySet())
{
if (entry.getKey().getNamespaceURI().equals(SITE_CUSTOM_PROPERTY_URL) == true)
{
customProperties.put(entry.getKey(), entry.getValue());
}
}
return customProperties;
}
/** /**
* Gets a map containing the site's custom properties * Gets a map containing the site's custom properties
* *
@@ -371,7 +394,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
*/ */
private Map<QName, Serializable> getSiteCustomProperties(NodeRef siteNodeRef) private Map<QName, Serializable> getSiteCustomProperties(NodeRef siteNodeRef)
{ {
Map<QName, Serializable> customProperties = new HashMap<QName, Serializable>(5); Map<QName, Serializable> customProperties = new HashMap<QName, Serializable>(4);
Map<QName, Serializable> properties = nodeService.getProperties(siteNodeRef); Map<QName, Serializable> properties = nodeService.getProperties(siteNodeRef);
for (Map.Entry<QName, Serializable> entry : properties.entrySet()) for (Map.Entry<QName, Serializable> entry : properties.entrySet())
@@ -429,7 +452,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
*/ */
public String getSiteRoleGroup(String shortName, String permission, boolean withGroupPrefix) public String getSiteRoleGroup(String shortName, String permission, boolean withGroupPrefix)
{ {
return getSiteGroup(shortName, withGroupPrefix) + "_" + permission; return getSiteGroup(shortName, withGroupPrefix) + '_' + permission;
} }
/** /**
@@ -535,19 +558,17 @@ public class SiteServiceImpl implements SiteService, SiteModel
private SiteInfo createSiteInfo(NodeRef siteNodeRef) private SiteInfo createSiteInfo(NodeRef siteNodeRef)
{ {
// Get the properties // Get the properties
Map<QName, Serializable> properties = this.nodeService Map<QName, Serializable> properties = this.nodeService.getProperties(siteNodeRef);
.getProperties(siteNodeRef);
String shortName = (String) properties.get(ContentModel.PROP_NAME); String shortName = (String) properties.get(ContentModel.PROP_NAME);
String sitePreset = (String) properties.get(PROP_SITE_PRESET); String sitePreset = (String) properties.get(PROP_SITE_PRESET);
String title = (String) properties.get(ContentModel.PROP_TITLE); String title = (String) properties.get(ContentModel.PROP_TITLE);
String description = (String) properties String description = (String) properties.get(ContentModel.PROP_DESCRIPTION);
.get(ContentModel.PROP_DESCRIPTION);
// Get the visibility of the site // Get the visibility of the site
SiteVisibility visibility = getSiteVisibility(siteNodeRef); SiteVisibility visibility = getSiteVisibility(siteNodeRef);
// Create and return the site information // Create and return the site information
Map<QName, Serializable> customProperties = getSiteCustomProperties(siteNodeRef); Map<QName, Serializable> customProperties = getSiteCustomProperties(properties);
SiteInfo siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, visibility, customProperties, siteNodeRef); SiteInfo siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, visibility, customProperties, siteNodeRef);
return siteInfo; return siteInfo;
} }
@@ -904,10 +925,18 @@ public class SiteServiceImpl implements SiteService, SiteModel
return result; return result;
} }
/**
* Helper method to get the permission groups for a given authority on a site.
* Returns empty List if the user does not have a explicit membership to the site.
*
* @param siteShortName site short name
* @param authorityName authority name
* @return List<String> Permission groups, empty list if no explicit membership set
*/
private List<String> getPermissionGroups(String siteShortName, String authorityName) private List<String> getPermissionGroups(String siteShortName, String authorityName)
{ {
List<String> result = new ArrayList<String>(5); List<String> result = new ArrayList<String>(5);
Set<String> roles = permissionService.getSettablePermissions(SiteModel.TYPE_SITE); Set<String> roles = this.permissionService.getSettablePermissions(SiteModel.TYPE_SITE);
for (String role : roles) for (String role : roles)
{ {
String roleGroup = getSiteRoleGroup(siteShortName, role, true); String roleGroup = getSiteRoleGroup(siteShortName, role, true);
@@ -920,30 +949,6 @@ public class SiteServiceImpl implements SiteService, SiteModel
return result; return result;
} }
/**
* Helper method to get the permission group for a given authority on a site.
* Returns null if the user does not have a explicit membership to the site.
*
* @param siteShortName site short name
* @param authorityName authority name
* @return String permission group, null if no explicit membership set
*/
// private String getPermissionGroup(String siteShortName, String authorityName)
// {
// String result = null;
// Set<String> groups = this.authorityService.getContainingAuthorities(AuthorityType.GROUP, authorityName, true);
// for (String group : groups)
// {
// if (group.startsWith(PermissionService.GROUP_PREFIX + "site_"
// + siteShortName) == true)
// {
// result = group;
// break;
// }
// }
// return result;
// }
/** /**
* @see org.alfresco.service.cmr.site.SiteService#getSiteRoles() * @see org.alfresco.service.cmr.site.SiteService#getSiteRoles()
*/ */