Merging BRANCHES/DEV/CMIS_10 to HEAD:

17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43  and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 
   17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API
   17732: Merge HEAD to DEV/CMIS10
   17756: MOB-563: SQL Tests - Lexer
   17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support
   17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl.
   17830: Fixes for CMIS lexer and parser tests
   17838: Access fix ups for access by the WS/Rest layers
   17869: 1) remote-api:
   17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id
   17883: Adjust version properties for dev/cmis10 branch.
   17885: Update OASIS CMIS TC status.
   17889: Fix issue where objectid is not rendered correctly for CMIS private working copies.
   17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names.
   17902: Fix issue where CMIS queries via GET used incorrect defaults for paging.
   17909: Fix CMIS link relations for folder tree.
   17912: Fix CMIS type descendants atompub link
   17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs.
   17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names)
   17927: Fix content stream create/update status to comply with CMIS 1.0 CD05.
   17934: Resolve encoding issues in CMIS AtomPub binding.
   17973: SAIL-171: CMIS Renditions REST binding
   17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree.
   17990: Update CMIS AtomPub to CD06
   17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2.
   18007: WS-Bindings were updated with CMIS 1.0 cd06 changes.
   18016: CMIS web services: Add missing generated files from WSDL
   18018: CMIS index page updates for cmis.alfresco.com
   18041: Merged HEAD to DEV/CMIS_10
   18059: SAIL-227:
   18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS()
   18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors
   18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'.
   18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like
   18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS()
   18173: SAIL-245: Exclude thumbnails from normal query results
   18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE
   18210: SAIL-156:  Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
   18211: SAIL-156:  Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
   18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery
   18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate
   18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings.
   18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added.
   18263: Build Fix
   18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties
   18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests
   18291: Fix Eclipse classpath problems
   18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented.
   18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings
   18329: Updated Chemistry TCK jar including Dave W's rendition tests.
   18333: Fix compile error - spurious imports.
   18334: Fix issue where absurl web script method failed when deployed to root context.
   18339: Update CMIS index page for start of public review 2.
   18387: SAIL-147: CMIS ACL REST bindings + framework fixes
   18392: Fix typo
   18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric>
   18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean
   18408: CMIS Query language - remove (pointless) multi-valued column from language definition
   18409: Formatting change for CMIS.g
   18410: Formatting change for FTS.g
   18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas.
   18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference)
   18417: Update Chemistry TCK which now incorporates Dave W's ACL tests.
   18419: Update CMIS index page to include public review end date.
   18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long.
   18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path.
   18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery).
   18477: SAIL-164: CMIS change log REST bindings
   18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions.
   18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties.
   18538: SAIL-164: CMIS change log fixes for TCK compliance
   18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 
   18582: Incorporate latest Chemistry TCK
   18583: Update list of supported CMIS capabilities in index page.
   18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support.
   18608: SAIL-159: Java / Javascript API access to CMIS Query Language
   18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable.
   18636: SAIL-184: ACL tests (WS) 
   18663: ACL tests were updated in accordance with last requirements by David Caruana.
   18680: Update to CMIS CD07
   18681: Fix CMIS ContentStreamId property when document has no content.
   18700: CMIS: Head merge problem resolution.

Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch.

Note: includes CMIS rendition support ready for integration and testing with DM renditions.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-02-23 17:23:42 +00:00
parent 8cbdacb18b
commit 575c970565
155 changed files with 33014 additions and 17420 deletions

View File

@@ -0,0 +1,273 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program 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 General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.cmis.renditions;
import org.alfresco.cmis.CMISRendition;
import org.alfresco.cmis.CMISRenditionKind;
import org.alfresco.service.cmr.repository.NodeRef;
/**
* CMIS Rendition Implementation
*
* @author Stas Sokolovsky
*/
public class CMISRenditionImpl implements CMISRendition
{
private NodeRef nodeRef;
private String streamId;
private String mimeType;
private CMISRenditionKind kind;
private Integer height;
private Integer width;
private String title;
private Integer length;
private String renditionDocumentId;
/**
* Construct a CmisRendition using fields
*
* @param nodeRef the rendition node reference
* @param streamId rendition stream id
* @param mimeType the MIME type of the rendition stream
* @param kind a categorization String associated with the rendition
* @param height the height of image
* @param width the width of image
* @param title rendition title
* @param length the length of the rendition stream in bytes
* @param renditionDocumentId the rendition document id
*/
public CMISRenditionImpl(NodeRef nodeRef, String streamId, String mimeType, CMISRenditionKind kind, Integer height, Integer width, String title, Integer length, String renditionDocumentId)
{
super();
this.nodeRef = nodeRef;
this.streamId = streamId;
this.mimeType = mimeType;
this.kind = kind;
this.height = height;
this.width = width;
this.title = title;
this.length = length;
this.renditionDocumentId = renditionDocumentId;
}
/**
* Default constructor
*/
public CMISRenditionImpl()
{
super();
}
/**
* @see org.alfresco.cmis.CMISRendition#getStreamId()
*/
public String getStreamId()
{
return streamId;
}
/**
* Set the rendition stream id
*
* @param streamId rendition stream id
*/
public void setStreamId(String streamId)
{
this.streamId = streamId;
}
/**
* @see org.alfresco.cmis.CMISRendition#getMimeType()
*/
public String getMimeType()
{
return mimeType;
}
/**
* Set the MIME type of the rendition stream
*
* @param mimeType the MIME type of the rendition stream
*/
public void setMimeType(String mimeType)
{
this.mimeType = mimeType;
}
/**
* @see org.alfresco.cmis.CMISRendition#getKind()
*/
public CMISRenditionKind getKind()
{
return kind;
}
/**
* Set rendition kind
*
* @param kind rendition kind
*/
public void setKind(CMISRenditionKind kind)
{
this.kind = kind;
}
/**
* @see org.alfresco.cmis.CMISRendition#getHeight()
*/
public Integer getHeight()
{
return height;
}
/**
* Set the height of image
*
* @param height the height of image
*/
public void setHeight(Integer height)
{
this.height = height;
}
/**
* @see org.alfresco.cmis.CMISRendition#getWidth()
*/
public Integer getWidth()
{
return width;
}
/**
* Set the width of image
*
* @param width the width of image
*/
public void setWidth(Integer width)
{
this.width = width;
}
/**
* @see org.alfresco.cmis.CMISRendition#getTitle()
*/
public String getTitle()
{
return title;
}
/**
* Set the title of rendition
*
* @param title the title
*/
public void setTitle(String title)
{
this.title = title;
}
/**
* @see org.alfresco.cmis.CMISRendition#getLength()
*/
public Integer getLength()
{
return length;
}
/**
* Set the length of the rendition stream in bytes
*
* @param length length of the rendition stream in bytes
*/
public void setLength(Integer length)
{
this.length = length;
}
/**
* @see org.alfresco.cmis.CMISRendition#getRenditionDocumentId()
*/
public String getRenditionDocumentId()
{
return renditionDocumentId;
}
/**
* Set the rendition document id
*
* @param renditionDocumentId the rendition document id
*/
public void setRenditionDocumentId(String renditionDocumentId)
{
this.renditionDocumentId = renditionDocumentId;
}
/*
* (non-Javadoc)
* @see org.alfresco.cmis.CMISRendition#getNodeRef()
*/
public NodeRef getNodeRef()
{
return this.nodeRef;
}
/**
* @param nodeRef
* the nodeRef to set
*/
public void setNodeRef(NodeRef nodeRef)
{
this.nodeRef = nodeRef;
}
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object obj)
{
if (this == obj)
{
return true;
}
if (obj instanceof CMISRendition)
{
CMISRendition that = (CMISRendition) obj;
return (this.getStreamId() != null && that.getStreamId() != null && this.getStreamId().equals(that.getStreamId()));
}
else
{
return false;
}
}
/**
* @see java.lang.Object#hashCode()
*/
public int hashCode()
{
return this.getStreamId() != null ? this.getStreamId().hashCode() : 0x01;
}
}

View File

@@ -0,0 +1,517 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program 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 General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.cmis.renditions;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.alfresco.cmis.CMISRendition;
import org.alfresco.cmis.CMISRenditionKind;
import org.alfresco.cmis.CMISRenditionService;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.transform.magick.ImageResizeOptions;
import org.alfresco.repo.content.transform.magick.ImageTransformationOptions;
import org.alfresco.repo.thumbnail.ThumbnailDefinition;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.thumbnail.ThumbnailService;
/**
* Rendition Service Implementation
*
* @author Stas Sokolovsky
*/
public class CMISRenditionServiceImpl implements CMISRenditionService
{
/** Rendition filter constants */
private static final String FILTER_WILDCARD = "*";
private static final String FILTER_NONE = "cmis:none";
private static final String FILTER_DELIMITER = ",";
private static final String SUBTYPES_POSTFIX = "/*";
private static final String SUBTYPES_DELIMITER = "/";
/** Service dependencies */
private ThumbnailService thumbnailService;
private NodeService nodeService;
/** Kind to thumbnail mapping */
private Map<String, List<String>> kindToThumbnailNames = new HashMap<String, List<String>>();
private Map<String, CMISRenditionKind> thumbnailNamesToKind = new HashMap<String, CMISRenditionKind>();
/** Custom renditions */
private CustomRenditionsCache customRenditionsCache;
/**
* @see org.alfresco.cmis.CMISRenditionService#getRenditions(org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
*/
public List<CMISRendition> getRenditions(NodeRef node, String renditionFilter)
{
Collection<CMISRendition> result = null;
ThumbnailFilter thumbnailFilter = getThumbnailFilter(renditionFilter);
if (thumbnailFilter != null)
{
result = getRenditions(node, thumbnailFilter);
}
return result != null ? new ArrayList<CMISRendition>(result) : null;
}
/**
* Get renditions for a document.
*
* @param node node reference of document
* @param thumbnailFilter thumbnail filter
* @return set of renditions
*/
private Set<CMISRendition> getRenditions(NodeRef node, ThumbnailFilter thumbnailFilter)
{
Set<CMISRendition> result = new HashSet<CMISRendition>();
if (thumbnailFilter.isAny())
{
result.addAll(getAllRenditions(node));
}
else
{
for (String thumbnailName : thumbnailFilter.getThumbnailNames())
{
CMISRendition rendition = getRenditionByThumbnailName(node, thumbnailName);
if (rendition != null)
{
result.add(rendition);
}
}
for (String mimetype : thumbnailFilter.getMimetypes())
{
result.addAll(getRenditionByMimetype(node, mimetype));
}
}
result.addAll(getCustomRenditions(thumbnailFilter));
return result;
}
/**
* Get rendition by thumbnail name.
*
* @param node node reference of document
* @param thumbnailName thumbnail name
* @return rendition
*/
private CMISRendition getRenditionByThumbnailName(NodeRef node, String thumbnailName)
{
CMISRendition result = null;
NodeRef thumbnailNode = thumbnailService.getThumbnailByName(node, ContentModel.PROP_CONTENT, thumbnailName);
if (thumbnailNode != null)
{
result = getRendition(thumbnailNode, node);
}
return result;
}
/**
* Get rendition by mimetype.
*
* @param node node reference of document
* @param mimetype rendition mimetype
* @return list of renditions
*/
private List<CMISRendition> getRenditionByMimetype(NodeRef node, String mimetype)
{
List<CMISRendition> result = new ArrayList<CMISRendition>();
List<NodeRef> thumbnails = thumbnailService.getThumbnails(node, ContentModel.PROP_CONTENT, mimetype, null);
if (thumbnails != null)
{
for (NodeRef thumbnailNode : thumbnails)
{
CMISRendition rendition = getRendition(thumbnailNode, node);
if (rendition != null)
{
result.add(rendition);
}
}
}
return result;
}
/**
* Convert the rendition filter to thumbnail filter.
*
* @param renditionFilter rendition filter
* @return thumbnail filter
*/
private ThumbnailFilter getThumbnailFilter(String renditionFilter)
{
ThumbnailFilter result = null;
if (renditionFilter != null && !renditionFilter.equals(FILTER_NONE))
{
result = new ThumbnailFilter();
if (renditionFilter.equals(FILTER_WILDCARD))
{
result.setAny(true);
}
else
{
String[] filterElements = renditionFilter.split(FILTER_DELIMITER);
if (filterElements == null || filterElements.length < 1)
{
throw new AlfrescoRuntimeException("Invalid rendition filter");
}
for (String filterElement : filterElements)
{
filterElement = filterElement.trim();
if (isRenditionKind(filterElement))
{
CMISRenditionKind kind = null;
for (CMISRenditionKind renditionKind : CMISRenditionKind.values())
{
if (renditionKind.getLabel().equals(filterElement))
{
kind = renditionKind;
}
}
result.getKinds().add(kind);
List<String> thumbnails = kindToThumbnailNames.get(filterElement);
if (thumbnails != null)
{
result.getThumbnailNames().addAll(thumbnails);
}
}
else
{
result.getMimetypes().add(filterElement);
}
}
}
}
return result;
}
/**
* Get the thumbnail definition.
*
* @param thumbnailName thumbnail name
* @return thumbnail definition
*/
private ThumbnailDefinition getThumbnailDefinition(String thumbnailName)
{
return thumbnailService.getThumbnailRegistry().getThumbnailDefinition(thumbnailName);
}
/**
* Get the image attributes of thumbnail.
*
* @param thumbnailName thumbnail name
* @return image attributes
*/
private ImageResizeOptions getImageAttributes(String thumbnailName)
{
ThumbnailDefinition thumbnailDefinition = getThumbnailDefinition(thumbnailName);
if (thumbnailDefinition != null && thumbnailDefinition.getTransformationOptions() != null
&& thumbnailDefinition.getTransformationOptions() instanceof ImageTransformationOptions)
{
return ((ImageTransformationOptions) thumbnailDefinition.getTransformationOptions()).getResizeOptions();
}
return null;
}
/**
* @param filterElement filter element
* @return true if filter element is rendition kind
*/
private boolean isRenditionKind(String filterElement)
{
boolean result = false;
for (CMISRenditionKind renditionKind : CMISRenditionKind.values())
{
if (renditionKind.getLabel().equals(filterElement))
{
result = true;
}
}
return result;
}
/**
* Create CMISRendition by thumbnailNode and documentNode.
*
* @param thumbnailNode thumbnail node reference
* @param documentNode document node reference
* @return CMISRendition
*/
private CMISRendition getRendition(NodeRef thumbnailNode, NodeRef documentNode)
{
CMISRenditionImpl rendition = null;
String thumbnailName = (String) nodeService.getProperty(thumbnailNode, ContentModel.PROP_THUMBNAIL_NAME);
CMISRenditionKind kind = thumbnailNamesToKind.get(thumbnailName);
if (thumbnailName != null && kind != null)
{
rendition = new CMISRenditionImpl();
ContentData contentData = (ContentData) nodeService.getProperty(thumbnailNode, ContentModel.PROP_CONTENT);
rendition.setNodeRef(thumbnailNode);
rendition.setStreamId(thumbnailNode.toString());
rendition.setRenditionDocumentId(documentNode.toString());
rendition.setTitle(thumbnailName);
rendition.setKind(kind);
rendition.setMimeType(contentData.getMimetype());
rendition.setLength((int) contentData.getSize());
ImageResizeOptions imageAttributes = getImageAttributes(thumbnailName);
if (imageAttributes != null)
{
rendition.setWidth(imageAttributes.getWidth());
rendition.setHeight(imageAttributes.getHeight());
}
}
return rendition;
}
/**
* Get custom renditions.
*
* @param thumbnailFilter thumbnail filter
* @return list of renditions
*/
private List<CMISRendition> getCustomRenditions(ThumbnailFilter filter)
{
List<CMISRendition> result = new ArrayList<CMISRendition>();
if (customRenditionsCache != null)
{
if (filter.isAny())
{
result.addAll(customRenditionsCache.getAllRenditions());
}
else
{
for (CMISRenditionKind kind : filter.getKinds())
{
List<CMISRendition> renditions = customRenditionsCache.getRenditionsByKind(kind);
if (renditions != null)
{
result.addAll(renditions);
}
}
for (String mimetype : filter.getMimetypes())
{
List<CMISRendition> renditions = customRenditionsCache.getRenditionsByMimeType(mimetype);
if (renditions != null)
{
result.addAll(renditions);
}
}
}
}
return result;
}
/**
* Get all renditions for a document.
*
* @param node document node ref
* @return list of renditions
*/
private List<CMISRendition> getAllRenditions(NodeRef node)
{
return getRenditionByMimetype(node, null);
}
/**
* Set rendition kind mapping.
*
* @param RenditionKind to Thumbnail Definition mapping
*/
public void setRenditionKindMapping(Map<String, List<String>> renditionKinds)
{
this.kindToThumbnailNames = renditionKinds;
for (Entry<String, List<String>> entry : renditionKinds.entrySet())
{
CMISRenditionKind kind = null;
for (CMISRenditionKind renditionKind : CMISRenditionKind.values())
{
if (renditionKind.getLabel().equals(entry.getKey()))
{
kind = renditionKind;
}
}
for (String thumbnailName : entry.getValue())
{
thumbnailNamesToKind.put(thumbnailName, kind);
}
}
}
/**
* Set custom renditions.
*
* @param renditions list of renditions
*/
public void setCustomRenditions(List<CMISRendition> renditions)
{
this.customRenditionsCache = new CustomRenditionsCache(renditions);
}
/**
* Set the NodeService.
*
* @param nodeService NodeService
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* Set the ThumbnailService.
*
* @param thumbnailService thumbnailService
*/
public void setThumbnailService(ThumbnailService thumbnailService)
{
this.thumbnailService = thumbnailService;
}
/**
* Cache that aggregates renditions informaition to allow fast searching by kind and mimetype
*/
private class CustomRenditionsCache
{
private Map<CMISRenditionKind, List<CMISRendition>> renditionsByKind;
private Map<String, List<CMISRendition>> renditionsByMimeType;
private Map<String, List<CMISRendition>> renditionsByBaseMimeType;
private List<CMISRendition> allRenditions;
public CustomRenditionsCache(List<CMISRendition> renditions)
{
allRenditions = renditions;
renditionsByKind = new HashMap<CMISRenditionKind, List<CMISRendition>>(renditions.size());
renditionsByMimeType = new HashMap<String, List<CMISRendition>>(renditions.size());
renditionsByBaseMimeType = new HashMap<String, List<CMISRendition>>(renditions.size());
for (CMISRendition rendition : renditions)
{
String baseType = getBaseType(rendition.getMimeType());
if (!renditionsByKind.containsKey(rendition.getKind()))
{
renditionsByKind.put(rendition.getKind(), new ArrayList<CMISRendition>(1));
}
if (!renditionsByMimeType.containsKey(rendition.getMimeType()))
{
renditionsByMimeType.put(rendition.getMimeType(), new ArrayList<CMISRendition>(1));
}
if (!renditionsByBaseMimeType.containsKey(baseType))
{
renditionsByBaseMimeType.put(baseType, new ArrayList<CMISRendition>(1));
}
renditionsByKind.get(rendition.getKind()).add(rendition);
renditionsByMimeType.get(rendition.getMimeType()).add(rendition);
renditionsByBaseMimeType.get(baseType).add(rendition);
}
}
public List<CMISRendition> getRenditionsByKind(CMISRenditionKind kind)
{
return renditionsByKind.get(kind);
}
public List<CMISRendition> getRenditionsByMimeType(String mimetype)
{
if (mimetype.endsWith(SUBTYPES_POSTFIX))
{
String baseMimetype = mimetype.substring(0, mimetype.length() - SUBTYPES_POSTFIX.length());
return renditionsByBaseMimeType.get(baseMimetype);
}
else
{
return renditionsByMimeType.get(mimetype);
}
}
public Collection<CMISRendition> getAllRenditions()
{
return allRenditions;
}
private String getBaseType(String mimetype)
{
String baseMymetype = mimetype;
int subTypeIndex = mimetype.indexOf(SUBTYPES_DELIMITER);
if (subTypeIndex > 0 || subTypeIndex < mimetype.length())
{
baseMymetype = mimetype.substring(0, subTypeIndex);
}
return baseMymetype;
}
}
/**
* Parsed RenditionFilter
*/
private class ThumbnailFilter
{
private List<CMISRenditionKind> kinds = new ArrayList<CMISRenditionKind>();
private List<String> thumbnailNames = new ArrayList<String>();
private List<String> mimetypes = new ArrayList<String>();
private boolean any = false;
public List<String> getThumbnailNames()
{
return thumbnailNames;
}
public List<String> getMimetypes()
{
return mimetypes;
}
public List<CMISRenditionKind> getKinds()
{
return kinds;
}
public boolean isAny()
{
return any;
}
public void setAny(boolean any)
{
this.any = any;
}
}
}

View File

@@ -0,0 +1,370 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program 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 General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.cmis.renditions;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.alfresco.cmis.CMISRendition;
import org.alfresco.cmis.CMISRenditionKind;
import org.alfresco.cmis.mapping.BaseCMISTest;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.magick.ImageTransformationOptions;
import org.alfresco.repo.thumbnail.ThumbnailDefinition;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
/**
* @author Stas Sokolovsky
*/
public class CMISRenditionServiceTest extends BaseCMISTest
{
private static final String[] THUMBNAIL_NAMES = new String[] { "doclib", "webpreview", "imgpreview" };
private static final CMISRenditionKind[] THUMBNAIL_KINDS = new CMISRenditionKind[] { CMISRenditionKind.THUMBNAIL, CMISRenditionKind.WEB_PREVIEW, CMISRenditionKind.WEB_PREVIEW };
private NodeRef document;
private List<CMISRendition> documentRenditions = new ArrayList<CMISRendition>();
private CMISRendition icon16Rendition = new CMISRenditionImpl(null, "alf:icon16", "image/gif", CMISRenditionKind.ICON16, 16, 16, null, null, null);
private CMISRendition icon32Rendition = new CMISRenditionImpl(null, "alf:icon32", "image/gif", CMISRenditionKind.ICON32, 32, 32, null, null, null);
public void setUp() throws Exception
{
super.setUp();
String documentName = "TestDocument" + System.currentTimeMillis();
document = createDocument(documentName, "Test Content", MimetypeMap.MIMETYPE_PDF);
documentRenditions = new ArrayList<CMISRendition>();
for (int i = 0; i < THUMBNAIL_NAMES.length; ++i)
{
documentRenditions.add(createRendition(document, THUMBNAIL_NAMES[i], THUMBNAIL_KINDS[i]));
}
}
public void testGetAllRenditions()
{
List<CMISRendition> receivedRenditions = cmisRenditionService.getRenditions(document, "*");
List<CMISRendition> expectedRenditions = new ArrayList<CMISRendition>();
expectedRenditions.addAll(documentRenditions);
expectedRenditions.add(icon16Rendition);
expectedRenditions.add(icon32Rendition);
assertRendiions(receivedRenditions, expectedRenditions);
}
public void testGetRenditionsByKind()
{
testGetRenditionsByKind(CMISRenditionKind.THUMBNAIL);
testGetRenditionsByKind(CMISRenditionKind.WEB_PREVIEW);
testGetRenditionsByKind(CMISRenditionKind.ICON16);
testGetRenditionsByKind(CMISRenditionKind.ICON32);
testGetRenditionsByKind(CMISRenditionKind.WEB_PREVIEW, CMISRenditionKind.ICON32);
testGetRenditionsByKind(CMISRenditionKind.THUMBNAIL, CMISRenditionKind.WEB_PREVIEW, CMISRenditionKind.ICON16, CMISRenditionKind.ICON32);
}
public void testGetRenditionsByMimetype()
{
for (CMISRendition rendition : documentRenditions)
{
testGetRenditionsByMimetype(rendition.getMimeType());
}
testGetRenditionsByMimetype(icon16Rendition.getMimeType());
testGetRenditionsByMimetype(icon32Rendition.getMimeType());
String[] mimetypes = getDifferentMimetypes();
testGetRenditionsByMimetype(mimetypes);
}
public void testEmptyFilter()
{
List<CMISRendition> receivedRenditions = cmisRenditionService.getRenditions(document, null);
assertTrue(receivedRenditions == null || receivedRenditions.size() == 0);
receivedRenditions = cmisRenditionService.getRenditions(document, "cmis:none");
assertTrue(receivedRenditions == null || receivedRenditions.size() == 0);
}
public void testRenditionsByBaseMimetype()
{
String[] mimetypes = getDifferentMimetypes();
List<String> baseMimetypeFilters = new ArrayList<String>();
for (String mimetype : mimetypes)
{
String baseMimetype = getBaseType(mimetype);
String filter = baseMimetype + "/*";
baseMimetypeFilters.add(filter);
testGetRenditionsByMimetype(filter);
}
testGetRenditionsByMimetype(baseMimetypeFilters.toArray(new String[0]));
}
public void testMixedFilter()
{
String[] mimetypes = getDifferentMimetypes();
testGetRenditions(THUMBNAIL_KINDS, mimetypes);
}
private void testGetRenditionsByMimetype(String... mimetypes)
{
testGetRenditions(null, mimetypes);
}
private void testGetRenditionsByKind(CMISRenditionKind... kinds)
{
testGetRenditions(kinds, null);
}
private void testGetRenditions(CMISRenditionKind[] kinds, String[] mimetypes)
{
String filter = createFilter(kinds, mimetypes);
List<CMISRendition> receivedRenditions = cmisRenditionService.getRenditions(document, filter);
List<CMISRendition> expectedRenditions = new ArrayList<CMISRendition>();
if (kinds != null)
{
for (CMISRenditionKind kind : kinds)
{
expectedRenditions.addAll(getRenditionsByKind(kind));
}
}
if (mimetypes != null)
{
for (String mimetype : mimetypes)
{
expectedRenditions.addAll(getRenditionsByMimetype(mimetype));
}
}
assertRendiions(receivedRenditions, expectedRenditions);
}
protected void tearDown() throws Exception
{
fileFolderService.delete(document);
super.tearDown();
}
private CMISRendition createRendition(NodeRef nodeRef, String thumbnailName, CMISRenditionKind kind)
{
ThumbnailDefinition details = thumbnailService.getThumbnailRegistry().getThumbnailDefinition(thumbnailName);
NodeRef thumbnailNodeRef = thumbnailService.createThumbnail(nodeRef, ContentModel.PROP_CONTENT, details.getMimetype(), details.getTransformationOptions(), details
.getName());
CMISRenditionImpl rendition = new CMISRenditionImpl();
rendition.setStreamId(thumbnailNodeRef.toString());
rendition.setKind(kind);
rendition.setMimeType(details.getMimetype());
if (details.getTransformationOptions() instanceof ImageTransformationOptions)
{
ImageTransformationOptions imageOptions = (ImageTransformationOptions) details.getTransformationOptions();
rendition.setWidth(imageOptions.getResizeOptions().getWidth());
rendition.setHeight(imageOptions.getResizeOptions().getHeight());
}
return rendition;
}
private NodeRef createDocument(String documentName, String documentContent, String mimetype)
{
NodeRef textDocument = fileFolderService.create(rootNodeRef, "TEXT" + documentName, ContentModel.TYPE_CONTENT).getNodeRef();
ContentWriter contentWriter = fileFolderService.getWriter(textDocument);
contentWriter.setEncoding("UTF-8");
contentWriter.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
contentWriter.setLocale(Locale.ENGLISH);
contentWriter.putContent(documentContent);
ContentReader contentReader = fileFolderService.getReader(textDocument);
NodeRef document = fileFolderService.create(rootNodeRef, documentName, ContentModel.TYPE_CONTENT).getNodeRef();
contentWriter = fileFolderService.getWriter(document);
contentWriter.setEncoding("UTF-8");
contentWriter.setMimetype(mimetype);
contentWriter.setLocale(Locale.ENGLISH);
if (contentService.isTransformable(contentReader, contentWriter))
{
contentService.transform(contentReader, contentWriter);
}
fileFolderService.delete(textDocument);
return document;
}
private void assertRendiions(List<CMISRendition> receivedRenditions, List<CMISRendition> expectedRenditions)
{
assertNotNull(receivedRenditions);
expectedRenditions = removeReplication(expectedRenditions);
assertTrue(receivedRenditions.size() == expectedRenditions.size());
for (CMISRendition rendition : receivedRenditions)
{
assertNotNull(rendition);
assertNotNull(rendition.getStreamId());
}
Collections.sort(receivedRenditions, renditionsComparator);
Collections.sort(expectedRenditions, renditionsComparator);
for (int i = 0; i < expectedRenditions.size(); ++i)
{
assertRendition(receivedRenditions.get(i), expectedRenditions.get(i));
}
}
private void assertRendition(CMISRendition receivedRendition, CMISRendition expectedRendition)
{
assertEquals(expectedRendition.getStreamId(), receivedRendition.getStreamId());
assertEquals(expectedRendition.getKind(), receivedRendition.getKind());
assertEquals(expectedRendition.getMimeType(), receivedRendition.getMimeType());
assertEquals(expectedRendition.getWidth(), receivedRendition.getWidth());
assertEquals(expectedRendition.getHeight(), receivedRendition.getHeight());
}
private List<CMISRendition> removeReplication(List<CMISRendition> renditions)
{
return new ArrayList<CMISRendition>(new HashSet<CMISRendition>(renditions));
}
private Comparator<CMISRendition> renditionsComparator = new Comparator<CMISRendition>()
{
public int compare(CMISRendition rendition1, CMISRendition rendition2)
{
return rendition1.getStreamId().compareTo(rendition2.getStreamId());
}
};
private List<CMISRendition> getRenditionsByKind(CMISRenditionKind kind)
{
return getRenditions(kind, null);
}
private List<CMISRendition> getRenditionsByMimetype(String mimetype)
{
return getRenditions(null, mimetype);
}
private List<CMISRendition> getRenditions(CMISRenditionKind kind, String mimetype)
{
List<CMISRendition> result = new ArrayList<CMISRendition>();
List<CMISRendition> allRenditions = new ArrayList<CMISRendition>(documentRenditions);
allRenditions.add(icon16Rendition);
allRenditions.add(icon32Rendition);
for (CMISRendition rendition : allRenditions)
{
if (isRenditionSatisfyConditions(rendition, kind, mimetype))
{
result.add(rendition);
}
}
return result;
}
private boolean isRenditionSatisfyConditions(CMISRendition rendition, CMISRenditionKind kind, String mimetype)
{
if (kind != null)
{
if (!kind.equals(rendition.getKind()))
{
return false;
}
}
if (mimetype != null)
{
if (mimetype.endsWith("/*"))
{
String baseMimetype = getBaseType(mimetype);
if (!rendition.getMimeType().startsWith(baseMimetype))
{
return false;
}
}
else if (!mimetype.equals(rendition.getMimeType()))
{
return false;
}
}
return true;
}
private String[] getDifferentMimetypes()
{
List<CMISRendition> allRenditions = new ArrayList<CMISRendition>(documentRenditions);
allRenditions.add(icon16Rendition);
allRenditions.add(icon32Rendition);
Set<String> mimetypes = new HashSet<String>();
for (CMISRendition rendition : allRenditions)
{
mimetypes.add(rendition.getMimeType());
}
return mimetypes.toArray(new String[0]);
}
private String getBaseType(String mimetype)
{
String baseMymetype = mimetype;
int subTypeIndex = mimetype.indexOf("/");
if (subTypeIndex > 0 || subTypeIndex < mimetype.length())
{
baseMymetype = mimetype.substring(0, subTypeIndex);
}
return baseMymetype;
}
private String createFilter(CMISRenditionKind[] kinds, String[] mimetypes)
{
StringBuilder filter = new StringBuilder();
if (kinds != null)
{
for (CMISRenditionKind kind : kinds)
{
filter.append(kind.getLabel());
filter.append(",");
}
}
if (mimetypes != null)
{
for (String mimetype : mimetypes)
{
filter.append(mimetype);
filter.append(",");
}
}
filter.delete(filter.length() - 1, filter.length());
return filter.toString();
}
}