From 7306ddb215a4520771685e54abf7ad05556b9c75 Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Wed, 25 Sep 2013 14:07:48 +0000 Subject: [PATCH] More fixes for ALF-19690 CMIS TCK Test Failures - fixed multi-tenancy impact for PARENT queries - while this looks like a big impact it is an API change and a fix in one section of common code - which is covered by the CMIS API test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../querymodel/impl/db/AspectSupport.java | 3 ++- .../querymodel/impl/db/DBConjunction.java | 5 +++-- .../querymodel/impl/db/DBDisjunction.java | 3 ++- .../impl/db/DBFunctionalConstraint.java | 5 +++-- .../impl/querymodel/impl/db/DBOrdering.java | 3 ++- .../impl/querymodel/impl/db/DBQuery.java | 19 ++++++++++--------- .../impl/db/DBQueryBuilderComponent.java | 3 ++- .../querymodel/impl/db/DBQueryEngine.java | 2 +- .../impl/querymodel/impl/db/DBSelector.java | 3 ++- .../querymodel/impl/db/ParentSupport.java | 3 ++- .../querymodel/impl/db/PropertySupport.java | 3 ++- .../impl/querymodel/impl/db/TypeSupport.java | 3 ++- .../impl/querymodel/impl/db/UUIDSupport.java | 3 ++- .../querymodel/impl/db/functions/DBChild.java | 5 +++-- .../impl/db/functions/DBDescendant.java | 3 ++- .../impl/db/functions/DBEquals.java | 5 +++-- .../impl/db/functions/DBExists.java | 3 ++- .../impl/db/functions/DBFTSFuzzyTerm.java | 3 ++- .../impl/db/functions/DBFTSPhrase.java | 5 +++-- .../impl/db/functions/DBFTSPrefixTerm.java | 3 ++- .../impl/db/functions/DBFTSProximity.java | 3 ++- .../impl/db/functions/DBFTSRange.java | 3 ++- .../impl/db/functions/DBFTSTerm.java | 5 +++-- .../impl/db/functions/DBFTSWildTerm.java | 3 ++- .../impl/db/functions/DBGreaterThan.java | 3 ++- .../db/functions/DBGreaterThanOrEquals.java | 3 ++- .../querymodel/impl/db/functions/DBIn.java | 5 +++-- .../impl/db/functions/DBLessThan.java | 3 ++- .../impl/db/functions/DBLessThanOrEquals.java | 3 ++- .../querymodel/impl/db/functions/DBLike.java | 3 ++- .../querymodel/impl/db/functions/DBLower.java | 3 ++- .../impl/db/functions/DBNotEquals.java | 5 +++-- .../impl/db/functions/DBPropertyAccessor.java | 3 ++- .../querymodel/impl/db/functions/DBScore.java | 3 ++- .../querymodel/impl/db/functions/DBUpper.java | 3 ++- 35 files changed, 85 insertions(+), 51 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java index 271b31a8d7..5fec808d36 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/AspectSupport.java @@ -27,6 +27,7 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -66,7 +67,7 @@ public class AspectSupport implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java index 212bc92dd7..c77885177e 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBConjunction.java @@ -29,6 +29,7 @@ import org.alfresco.repo.search.impl.querymodel.Constraint; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.QueryModelException; import org.alfresco.repo.search.impl.querymodel.impl.BaseConjunction; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -61,7 +62,7 @@ public class DBConjunction extends BaseConjunction implements DBQueryBuilderComp * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { for (Constraint constraint : getConstraints()) @@ -73,7 +74,7 @@ public class DBConjunction extends BaseConjunction implements DBQueryBuilderComp throw new QueryModelException("Disjunctions are not suported"); } DBQueryBuilderComponent dbQueryBuilderComponent = (DBQueryBuilderComponent) constraint; - dbQueryBuilderComponent.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectors, functionArgs, functionContext); + dbQueryBuilderComponent.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectors, functionArgs, functionContext); } else { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java index a0d5483b21..aea84082db 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBDisjunction.java @@ -29,6 +29,7 @@ import org.alfresco.repo.search.impl.querymodel.Constraint; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.QueryModelException; import org.alfresco.repo.search.impl.querymodel.impl.BaseDisjunction; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -61,7 +62,7 @@ public class DBDisjunction extends BaseDisjunction implements DBQueryBuilderComp * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Disjunctions are not suported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java index edf946b060..42fd47420b 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBFunctionalConstraint.java @@ -28,6 +28,7 @@ import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.Function; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.impl.BaseFunctionalConstraint; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -62,7 +63,7 @@ public class DBFunctionalConstraint extends BaseFunctionalConstraint implements * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { Function function = getFunction(); if(function != null) @@ -70,7 +71,7 @@ public class DBFunctionalConstraint extends BaseFunctionalConstraint implements if(function instanceof DBQueryBuilderComponent) { DBQueryBuilderComponent dbQueryBuilderComponent = (DBQueryBuilderComponent)function; - dbQueryBuilderComponent.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectors, getFunctionArguments(), functionContext); + dbQueryBuilderComponent.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectors, getFunctionArguments(), functionContext); } else { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java index e923a5a130..636f60de7f 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBOrdering.java @@ -33,6 +33,7 @@ import org.alfresco.repo.search.impl.querymodel.QueryModelException; import org.alfresco.repo.search.impl.querymodel.impl.BaseOrdering; import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor; import org.alfresco.repo.search.impl.querymodel.impl.functions.Score; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -69,7 +70,7 @@ public class DBOrdering extends BaseOrdering implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { if (getColumn().getFunction().getName().equals(PropertyAccessor.NAME)) diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java index 70a848e7a0..66e988ad2f 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQuery.java @@ -39,6 +39,7 @@ import org.alfresco.repo.search.impl.querymodel.QueryModelException; import org.alfresco.repo.search.impl.querymodel.Selector; import org.alfresco.repo.search.impl.querymodel.Source; import org.alfresco.repo.search.impl.querymodel.impl.BaseQuery; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; @@ -160,7 +161,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent * .DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { selectorGroup = selectors; @@ -171,7 +172,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent Selector current = getSource().getSelector(selector); if (current instanceof DBQueryBuilderComponent) { - ((DBQueryBuilderComponent) current).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectorGroup, functionArgs, functionContext); + ((DBQueryBuilderComponent) current).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectorGroup, functionArgs, functionContext); } else { @@ -184,7 +185,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent { if (getConstraint() instanceof DBQueryBuilderComponent) { - ((DBQueryBuilderComponent) getConstraint()).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectorGroup, functionArgs, functionContext); + ((DBQueryBuilderComponent) getConstraint()).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectorGroup, functionArgs, functionContext); } else { @@ -198,7 +199,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent { if(ordering instanceof DBQueryBuilderComponent) { - ((DBQueryBuilderComponent) ordering).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectorGroup, functionArgs, functionContext); + ((DBQueryBuilderComponent) ordering).prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectorGroup, functionArgs, functionContext); } else { @@ -370,7 +371,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent } } - public static Long getDbid(String source, NodeDAO nodeDAO) + public static Long getDbid(String source, NodeDAO nodeDAO, TenantService tenantService) { // Ignore version label for now String ref; @@ -394,7 +395,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent if (NodeRef.isNodeRef(ref)) { - NodeRef nodeRef = new NodeRef(ref); + NodeRef nodeRef = tenantService.getName(new NodeRef(ref)); Pair pair = nodeDAO.getNodePair(nodeRef); if (pair == null) { @@ -408,7 +409,7 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent else { - NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, ref); + NodeRef nodeRef = new NodeRef(tenantService.getName(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), ref); Pair pair = nodeDAO.getNodePair(nodeRef); if (pair == null) { @@ -811,12 +812,12 @@ public class DBQuery extends BaseQuery implements DBQueryBuilderComponent * @param nodeDAO * @return */ - public static Long[] getDbids(String[] stringValues, NodeDAO nodeDAO) + public static Long[] getDbids(String[] stringValues, NodeDAO nodeDAO, TenantService tenantService) { Long[] dbids = new Long[stringValues.length]; for(int i = 0; i < stringValues.length; i++) { - dbids[i] = getDbid(stringValues[i], nodeDAO); + dbids[i] = getDbid(stringValues[i], nodeDAO, tenantService); } return dbids; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java index 0b2ea94092..6b48bd5801 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryBuilderComponent.java @@ -26,6 +26,7 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -50,7 +51,7 @@ public interface DBQueryBuilderComponent * Use the QNameDAO to look up any ids * @param functionArgs */ - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext); + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext); /** * Build the Set of required joins diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java index c9b6cce4a4..ca3a03d6b1 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java @@ -170,7 +170,7 @@ public class DBQueryEngine implements QueryEngine { dbQuery.setSysDeletedType(sysDeletedType.getFirst()); } - dbQuery.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, selectorGroup, null, functionContext); + dbQuery.prepare(namespaceService, dictionaryService, qnameDAO, nodeDAO, tenantService, selectorGroup, null, functionContext); List nodes = (List)template.selectList(SELECT_BY_DYNAMIC_QUERY, dbQuery); LinkedHashSet set = new LinkedHashSet(nodes.size()); for(Node node : nodes) diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java index 9c40e97306..8b13a83e75 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBSelector.java @@ -29,6 +29,7 @@ import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.impl.BaseSelector; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.ClassDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; @@ -73,7 +74,7 @@ public class DBSelector extends BaseSelector implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { ClassDefinition classDef = dictionaryService.getClass(getType()); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java index 88ff7d1f7f..c9826803b0 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/ParentSupport.java @@ -26,6 +26,7 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -88,7 +89,7 @@ public class ParentSupport implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java index b62f23b841..70696c671e 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/PropertySupport.java @@ -30,6 +30,7 @@ import org.alfresco.repo.search.impl.lucene.LuceneFunction; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; import org.alfresco.repo.search.impl.querymodel.QueryModelException; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; @@ -151,7 +152,7 @@ public class PropertySupport implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java index 0454df5c00..6c8f55f71b 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/TypeSupport.java @@ -27,6 +27,7 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -76,7 +77,7 @@ public class TypeSupport implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java index 0e09a2685b..4d5ed9f337 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/UUIDSupport.java @@ -26,6 +26,7 @@ import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.search.impl.querymodel.Argument; import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.NamespaceService; @@ -102,7 +103,7 @@ public class UUIDSupport implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java index e182a10730..787424c63c 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBChild.java @@ -34,6 +34,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.ParentSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.Child; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -60,7 +61,7 @@ public class DBChild extends Child implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { Argument argument = functionArgs.get(ARG_PARENT); @@ -82,7 +83,7 @@ public class DBChild extends Child implements DBQueryBuilderComponent } } ParentSupport parentSupport = new ParentSupport(); - parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO)); + parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO, tenantService)); parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.EQUALS); builderSupport = parentSupport; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java index 5d3521696b..dda39a9792 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBDescendant.java @@ -31,6 +31,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.Descendant; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -61,7 +62,7 @@ public class DBDescendant extends Descendant implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Descendant/IN_TREE() is unsupported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java index aba2635887..9c3db66e1e 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBEquals.java @@ -38,6 +38,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.UUIDSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.Equals; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -70,7 +71,7 @@ public class DBEquals extends Equals implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); @@ -82,7 +83,7 @@ public class DBEquals extends Equals implements DBQueryBuilderComponent { ParentSupport parentSupport = new ParentSupport(); String id = (String) staticValue; - parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO)); + parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO, tenantService)); parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.EQUALS); builderSupport = parentSupport; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java index 6a8c4a6da7..ee39e20411 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBExists.java @@ -38,6 +38,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.UUIDSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.Exists; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.NamespaceService; @@ -71,7 +72,7 @@ public class DBExists extends Exists implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { PropertyArgument propertyArgument = (PropertyArgument) functionArgs.get(ARG_PROPERTY); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java index a3a5744775..2e8dafae09 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSFuzzyTerm.java @@ -31,6 +31,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSFuzzyTerm; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBFTSFuzzyTerm extends FTSFuzzyTerm implements DBQueryBuilderCompo * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Fuzzy term is unsupported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java index f5a7bee795..6ca070223a 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPhrase.java @@ -40,6 +40,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.ParentSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSPhrase; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -71,7 +72,7 @@ public class DBFTSPhrase extends FTSPhrase implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { @@ -87,7 +88,7 @@ public class DBFTSPhrase extends FTSPhrase implements DBQueryBuilderComponent { ParentSupport parentSupport = new ParentSupport(); String id = (String) term; - parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO)); + parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO, tenantService)); parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.EQUALS); builderSupport = parentSupport; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java index b63b3b50b1..be7fddd639 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSPrefixTerm.java @@ -36,6 +36,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSPrefixTerm; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -66,7 +67,7 @@ public class DBFTSPrefixTerm extends FTSPrefixTerm implements DBQueryBuilderComp * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { Argument argument = functionArgs.get(ARG_TERM); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java index dc6e36202b..0de69ce6dd 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSProximity.java @@ -31,6 +31,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSProximity; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBFTSProximity extends FTSProximity implements DBQueryBuilderCompon * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Proximity term is unsupported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java index 6f2601023e..6dace0d545 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSRange.java @@ -31,6 +31,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSRange; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBFTSRange extends FTSRange implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Range term is unsupported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java index 9a670b9e1e..e0369752b7 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSTerm.java @@ -40,6 +40,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.ParentSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSTerm; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -70,7 +71,7 @@ public class DBFTSTerm extends FTSTerm implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { Argument argument = functionArgs.get(ARG_TERM); @@ -85,7 +86,7 @@ public class DBFTSTerm extends FTSTerm implements DBQueryBuilderComponent { ParentSupport parentSupport = new ParentSupport(); String id = (String) term; - parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO)); + parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO, tenantService)); parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.EQUALS); builderSupport = parentSupport; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java index a4c6d44101..fa5ababd09 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBFTSWildTerm.java @@ -31,6 +31,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSWildTerm; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBFTSWildTerm extends FTSWildTerm implements DBQueryBuilderCompone * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { throw new QueryModelException("Wild term is unsupported"); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java index 9745d9f6bf..1a6998d904 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThan.java @@ -35,6 +35,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.GreaterThan; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -62,7 +63,7 @@ public class DBGreaterThan extends GreaterThan implements DBQueryBuilderComponen * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java index c178b1a59d..f34bafe58d 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBGreaterThanOrEquals.java @@ -35,6 +35,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.GreaterThanOrEquals; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -67,7 +68,7 @@ public class DBGreaterThanOrEquals extends GreaterThanOrEquals implements DBQuer * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java index 93719d9ae7..826261b24b 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBIn.java @@ -42,6 +42,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.UUIDSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.In; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.NamespaceService; @@ -71,7 +72,7 @@ public class DBIn extends In implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { PropertyArgument propertyArgument = (PropertyArgument) functionArgs.get(ARG_PROPERTY); @@ -85,7 +86,7 @@ public class DBIn extends In implements DBQueryBuilderComponent if (propertyArgument.getPropertyName().equals(PropertyIds.PARENT_ID)) { ParentSupport parentSupport = new ParentSupport(); - parentSupport.setDbids(DBQuery.getDbids(DBQuery.toStringValues(collection), nodeDAO)); + parentSupport.setDbids(DBQuery.getDbids(DBQuery.toStringValues(collection), nodeDAO, tenantService)); if((not != null) && (not.equals(Boolean.TRUE))) { parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.NOTIN); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java index f3a640b777..59e5eb928a 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThan.java @@ -35,6 +35,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThan; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -67,7 +68,7 @@ public class DBLessThan extends LessThan implements DBQueryBuilderComponent * org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java index c3c9d305ae..c33fedae62 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLessThanOrEquals.java @@ -35,6 +35,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.LessThanOrEquals; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -62,7 +63,7 @@ public class DBLessThanOrEquals extends LessThanOrEquals implements DBQueryBuild * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java index 6193fb6cae..cba4a85e50 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLike.java @@ -35,6 +35,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicateP import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommandType; import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.Like; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.namespace.NamespaceService; @@ -62,7 +63,7 @@ public class DBLike extends Like implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { PropertyArgument propertyArgument = (PropertyArgument) functionArgs.get(ARG_PROPERTY); diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java index 6328190d53..4b39fad5af 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBLower.java @@ -30,6 +30,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.Lower; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -57,7 +58,7 @@ public class DBLower extends Lower implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { // TODO Auto-generated method stub diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java index 8fb6a1a90f..72465c98fe 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBNotEquals.java @@ -38,6 +38,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.PropertySupport; import org.alfresco.repo.search.impl.querymodel.impl.db.TypeSupport; import org.alfresco.repo.search.impl.querymodel.impl.db.UUIDSupport; import org.alfresco.repo.search.impl.querymodel.impl.functions.NotEquals; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -65,7 +66,7 @@ public class DBNotEquals extends NotEquals implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { setPropertyAndStaticArguments(functionArgs); @@ -75,7 +76,7 @@ public class DBNotEquals extends NotEquals implements DBQueryBuilderComponent { ParentSupport parentSupport = new ParentSupport(); String id = (String) staticValue; - parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO)); + parentSupport.setDbid(DBQuery.getDbid(id, nodeDAO, tenantService)); parentSupport.setCommandType(DBQueryBuilderPredicatePartCommandType.NOTEQUALS); builderSupport = parentSupport; } diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java index 2283c5fd34..b54275e08b 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBPropertyAccessor.java @@ -30,6 +30,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBPropertyAccessor extends PropertyAccessor implements DBQueryBuild * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { // TODO Auto-generated method stub diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java index 827edb0a7b..efd2914c1c 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBScore.java @@ -30,6 +30,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.Score; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBScore extends Score implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { // TODO Auto-generated method stub diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java index 4531e701c9..ef396782a6 100644 --- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java +++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/db/functions/DBUpper.java @@ -30,6 +30,7 @@ import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderJoinCommand; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderPredicatePartCommand; import org.alfresco.repo.search.impl.querymodel.impl.functions.Upper; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -55,7 +56,7 @@ public class DBUpper extends Upper implements DBQueryBuilderComponent * @see org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryBuilderComponent#prepare(org.alfresco.service.namespace.NamespaceService, org.alfresco.service.cmr.dictionary.DictionaryService, org.alfresco.repo.domain.qname.QNameDAO, org.alfresco.repo.domain.node.NodeDAO, java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext) */ @Override - public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, Set selectors, + public void prepare(NamespaceService namespaceService, DictionaryService dictionaryService, QNameDAO qnameDAO, NodeDAO nodeDAO, TenantService tenantService, Set selectors, Map functionArgs, FunctionEvaluationContext functionContext) { // TODO Auto-generated method stub