mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
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
294 lines
8.3 KiB
Java
294 lines
8.3 KiB
Java
/*
|
|
* Copyright (C) 2005-2007 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.search;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.cmis.CMISDictionaryService;
|
|
import org.alfresco.cmis.CMISQueryOptions;
|
|
import org.alfresco.cmis.CMISResultSet;
|
|
import org.alfresco.cmis.CMISResultSetMetaData;
|
|
import org.alfresco.cmis.CMISResultSetRow;
|
|
import org.alfresco.repo.search.impl.querymodel.Query;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.search.ResultSet;
|
|
import org.alfresco.service.cmr.search.ResultSetRow;
|
|
|
|
/**
|
|
* @author andyh
|
|
*/
|
|
public class CMISResultSetImpl implements CMISResultSet, Serializable
|
|
{
|
|
private static final long serialVersionUID = 2014688399588268994L;
|
|
|
|
private Map<String, ResultSet> wrapped;
|
|
|
|
CMISQueryOptions options;
|
|
|
|
NodeService nodeService;
|
|
|
|
Query query;
|
|
|
|
CMISDictionaryService cmisDictionaryService;
|
|
|
|
DictionaryService alfrescoDictionaryService;
|
|
|
|
public CMISResultSetImpl(Map<String, ResultSet> wrapped, CMISQueryOptions options, NodeService nodeService, Query query, CMISDictionaryService cmisDictionaryService,
|
|
DictionaryService alfrescoDictionaryService)
|
|
{
|
|
this.wrapped = wrapped;
|
|
this.options = options;
|
|
this.nodeService = nodeService;
|
|
this.query = query;
|
|
this.cmisDictionaryService = cmisDictionaryService;
|
|
this.alfrescoDictionaryService = alfrescoDictionaryService;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#close()
|
|
*/
|
|
public void close()
|
|
{
|
|
// results sets can be used for more than one selector so we need to keep track of what we have closed
|
|
Set<ResultSet> closed = new HashSet<ResultSet>();
|
|
for (ResultSet resultSet : wrapped.values())
|
|
{
|
|
if (!closed.contains(resultSet))
|
|
{
|
|
resultSet.close();
|
|
closed.add(resultSet);
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#getMetaData()
|
|
*/
|
|
public CMISResultSetMetaData getMetaData()
|
|
{
|
|
return new CMISResultSetMetaDataImpl(options, query, cmisDictionaryService, alfrescoDictionaryService);
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#getRow(int)
|
|
*/
|
|
public CMISResultSetRow getRow(int i)
|
|
{
|
|
return new CMISResultSetRowImpl(this, i, getScores(i), nodeService, getNodeRefs(i), query, cmisDictionaryService);
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#hasMore()
|
|
*/
|
|
public boolean hasMore()
|
|
{
|
|
for (ResultSet resultSet : wrapped.values())
|
|
{
|
|
if (resultSet.hasMore())
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#length()
|
|
*/
|
|
public int getLength()
|
|
{
|
|
for (ResultSet resultSet : wrapped.values())
|
|
{
|
|
return resultSet.length();
|
|
}
|
|
throw new IllegalStateException();
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see org.alfresco.cmis.search.CMISResultSet#start()
|
|
*/
|
|
public int getStart()
|
|
{
|
|
return options.getSkipCount();
|
|
}
|
|
|
|
/*
|
|
* (non-Javadoc)
|
|
* @see java.lang.Iterable#iterator()
|
|
*/
|
|
public Iterator<CMISResultSetRow> iterator()
|
|
{
|
|
return new CMISResultSetRowIteratorImpl(this);
|
|
}
|
|
|
|
private Map<String, NodeRef> getNodeRefs(int i)
|
|
{
|
|
HashMap<String, NodeRef> refs = new HashMap<String, NodeRef>();
|
|
for (String selector : wrapped.keySet())
|
|
{
|
|
ResultSet rs = wrapped.get(selector);
|
|
refs.put(selector, rs.getNodeRef(i));
|
|
}
|
|
return refs;
|
|
}
|
|
|
|
private Map<String, Float> getScores(int i)
|
|
{
|
|
HashMap<String, Float> scores = new HashMap<String, Float>();
|
|
for (String selector : wrapped.keySet())
|
|
{
|
|
ResultSet rs = wrapped.get(selector);
|
|
scores.put(selector, Float.valueOf(rs.getScore(i)));
|
|
}
|
|
return scores;
|
|
}
|
|
|
|
public ChildAssociationRef getChildAssocRef(int n)
|
|
{
|
|
NodeRef nodeRef = getNodeRef(n);
|
|
return nodeService.getPrimaryParent(nodeRef);
|
|
}
|
|
|
|
public List<ChildAssociationRef> getChildAssocRefs()
|
|
{
|
|
ArrayList<ChildAssociationRef> cars = new ArrayList<ChildAssociationRef>(length());
|
|
for (ResultSetRow row : this)
|
|
{
|
|
cars.add(row.getChildAssocRef());
|
|
}
|
|
return cars;
|
|
}
|
|
|
|
public NodeRef getNodeRef(int n)
|
|
{
|
|
Map<String, NodeRef> refs = getNodeRefs(n);
|
|
if (refs.size() == 1)
|
|
{
|
|
return refs.values().iterator().next();
|
|
}
|
|
else if(allNodeRefsEqual(refs))
|
|
{
|
|
return refs.values().iterator().next();
|
|
}
|
|
else {
|
|
throw new IllegalStateException("Ambiguous selector");
|
|
}
|
|
}
|
|
|
|
private boolean allNodeRefsEqual(Map<String, NodeRef> selected)
|
|
{
|
|
NodeRef last = null;
|
|
for (NodeRef current : selected.values())
|
|
{
|
|
if (last == null)
|
|
{
|
|
last = current;
|
|
}
|
|
else
|
|
{
|
|
if (!last.equals(current))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public List<NodeRef> getNodeRefs()
|
|
{
|
|
ArrayList<NodeRef> nodeRefs = new ArrayList<NodeRef>(length());
|
|
for (ResultSetRow row : this)
|
|
{
|
|
nodeRefs.add(row.getNodeRef());
|
|
}
|
|
return nodeRefs;
|
|
}
|
|
|
|
public CMISResultSetMetaData getResultSetMetaData()
|
|
{
|
|
return getMetaData();
|
|
}
|
|
|
|
public float getScore(int n)
|
|
{
|
|
Map<String, Float> scores = getScores(n);
|
|
if (scores.size() == 1)
|
|
{
|
|
return scores.values().iterator().next();
|
|
}
|
|
else if(allScoresEqual(scores))
|
|
{
|
|
return scores.values().iterator().next();
|
|
}
|
|
else
|
|
{
|
|
throw new IllegalStateException("Ambiguous selector");
|
|
}
|
|
}
|
|
|
|
private boolean allScoresEqual(Map<String, Float> scores)
|
|
{
|
|
Float last = null;
|
|
for (Float current : scores.values())
|
|
{
|
|
if (last == null)
|
|
{
|
|
last = current;
|
|
}
|
|
else
|
|
{
|
|
if (!last.equals(current))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public int length()
|
|
{
|
|
return getLength();
|
|
}
|
|
|
|
}
|