mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
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:
@@ -36,6 +36,7 @@ import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.queryParser.ParseException;
|
||||
import org.apache.lucene.search.Query;
|
||||
@@ -215,6 +216,19 @@ public interface FunctionEvaluationContext
|
||||
* @return the lucene function appropriate to a function argument
|
||||
*/
|
||||
public LuceneFunction getLuceneFunction(FunctionArgument functionArgument);
|
||||
|
||||
/**
|
||||
* @param type
|
||||
* @param propertyName
|
||||
*/
|
||||
public void checkFieldApplies(Selector selector, String propertyName);
|
||||
|
||||
/**
|
||||
* Is this a multi-valued property?
|
||||
* @param propertyName
|
||||
* @return
|
||||
*/
|
||||
public boolean isMultiValued(String propertyName);
|
||||
|
||||
|
||||
}
|
||||
|
@@ -30,5 +30,5 @@ package org.alfresco.repo.search.impl.querymodel;
|
||||
*/
|
||||
public enum PredicateMode
|
||||
{
|
||||
ANY, ALL;
|
||||
ANY, SINGLE_VALUED_PROPERTY;
|
||||
}
|
||||
|
@@ -53,6 +53,11 @@ public abstract class BaseComparison extends BaseFunction
|
||||
* Right hand side
|
||||
*/
|
||||
public final static String ARG_RHS = "RHS";
|
||||
|
||||
/**
|
||||
* Mode: SVP or mode for MVP comparisons
|
||||
*/
|
||||
public final static String ARG_MODE = "Mode";
|
||||
|
||||
/**
|
||||
* Args
|
||||
@@ -70,6 +75,8 @@ public abstract class BaseComparison extends BaseFunction
|
||||
ARGS = new LinkedHashMap<String, ArgumentDefinition>();
|
||||
ARGS.put(ARG_LHS, new BaseArgumentDefinition(Multiplicity.ANY, ARG_LHS, DataTypeDefinition.ANY, true));
|
||||
ARGS.put(ARG_RHS, new BaseArgumentDefinition(Multiplicity.ANY, ARG_RHS, DataTypeDefinition.ANY, true));
|
||||
ARGS.put(ARG_MODE, new BaseArgumentDefinition(Multiplicity.ANY, ARG_MODE, DataTypeDefinition.ANY, true));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,7 +89,7 @@ public abstract class BaseComparison extends BaseFunction
|
||||
super(name, returnType, argumentDefinitions);
|
||||
}
|
||||
|
||||
protected void setPropertyAndStaticArguments(Map<String, Argument> functionArgs)
|
||||
public void setPropertyAndStaticArguments(Map<String, Argument> functionArgs)
|
||||
{
|
||||
Argument lhs = functionArgs.get(ARG_LHS);
|
||||
Argument rhs = functionArgs.get(ARG_RHS);
|
||||
@@ -181,7 +188,7 @@ public abstract class BaseComparison extends BaseFunction
|
||||
return functionArgument;
|
||||
}
|
||||
|
||||
protected String getPropertyName()
|
||||
public String getPropertyName()
|
||||
{
|
||||
if (propertyArgument != null)
|
||||
{
|
||||
|
@@ -110,6 +110,7 @@ public class LuceneQuery extends BaseQuery implements LuceneQueryBuilder
|
||||
{
|
||||
LuceneQueryBuilderComponent luceneQueryBuilderComponent = (LuceneQueryBuilderComponent) constraint;
|
||||
Query constraintQuery = luceneQueryBuilderComponent.addComponent(selectors, null, luceneContext, functionContext);
|
||||
constraintQuery.setBoost(constraint.getBoost());
|
||||
if (constraintQuery != null)
|
||||
{
|
||||
switch (constraint.getOccur())
|
||||
|
@@ -27,6 +27,7 @@ package org.alfresco.repo.search.impl.querymodel.impl.lucene;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -143,10 +144,19 @@ public class LuceneQueryEngine implements QueryEngine
|
||||
SearchParameters searchParameters = new SearchParameters();
|
||||
searchParameters.setBulkFetch(options.getFetchSize() > 0);
|
||||
searchParameters.setBulkFetchSize(options.getFetchSize());
|
||||
if(options.getLocales().size() > 0)
|
||||
{
|
||||
for(Locale locale: options.getLocales())
|
||||
{
|
||||
searchParameters.addLocale(locale);
|
||||
}
|
||||
}
|
||||
searchParameters.excludeDataInTheCurrentTransaction(!options.isIncludeInTransactionData());
|
||||
searchParameters.setSkipCount(options.getSkipCount());
|
||||
searchParameters.setMaxPermissionChecks(options.getMaxPermissionChecks());
|
||||
searchParameters.setMaxPermissionCheckTimeMillis(options.getMaxPermissionCheckTimeMillis());
|
||||
searchParameters.setDefaultFieldName(options.getDefaultFieldName());
|
||||
searchParameters.setMlAnalaysisMode(options.getMlAnalaysisMode());
|
||||
if (options.getMaxItems() >= 0)
|
||||
{
|
||||
searchParameters.setLimitBy(LimitBy.FINAL_SIZE);
|
||||
|
@@ -69,6 +69,22 @@ public class LuceneChild extends Child implements LuceneQueryBuilderComponent
|
||||
LuceneQueryParser lqp = luceneContext.getLuceneQueryParser();
|
||||
Argument argument = functionArgs.get(ARG_PARENT);
|
||||
String id = (String) argument.getValue(functionContext);
|
||||
argument = functionArgs.get(ARG_SELECTOR);
|
||||
if(argument != null)
|
||||
{
|
||||
String selector = (String) argument.getValue(functionContext);
|
||||
if(!selectors.contains(selector))
|
||||
{
|
||||
throw new QueryModelException("Unkown selector "+selector);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(selectors.size() > 1)
|
||||
{
|
||||
throw new QueryModelException("Selector must be specified for child constraint (IN_FOLDER) and join");
|
||||
}
|
||||
}
|
||||
NodeRef nodeRef;
|
||||
if(NodeRef.isNodeRef(id))
|
||||
{
|
||||
@@ -97,6 +113,10 @@ public class LuceneChild extends Child implements LuceneQueryBuilderComponent
|
||||
throw new QueryModelException("Invalid Object Id "+id);
|
||||
}
|
||||
}
|
||||
if(!functionContext.getNodeService().exists(nodeRef))
|
||||
{
|
||||
throw new QueryModelException("Object does not exist: "+id);
|
||||
}
|
||||
Query query = lqp.getFieldQuery("PARENT", nodeRef.toString());
|
||||
return query;
|
||||
|
||||
|
@@ -70,6 +70,22 @@ public class LuceneDescendant extends Descendant implements LuceneQueryBuilderCo
|
||||
LuceneQueryParser lqp = luceneContext.getLuceneQueryParser();
|
||||
Argument argument = functionArgs.get(ARG_ANCESTOR);
|
||||
String id = (String) argument.getValue(functionContext);
|
||||
argument = functionArgs.get(ARG_SELECTOR);
|
||||
if(argument != null)
|
||||
{
|
||||
String selector = (String) argument.getValue(functionContext);
|
||||
if(!selectors.contains(selector))
|
||||
{
|
||||
throw new QueryModelException("Unkown selector "+selector);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(selectors.size() > 1)
|
||||
{
|
||||
throw new QueryModelException("Selector must be specified for child constraint (IN_TREE) and join");
|
||||
}
|
||||
}
|
||||
NodeRef nodeRef;
|
||||
if(NodeRef.isNodeRef(id))
|
||||
{
|
||||
@@ -98,6 +114,10 @@ public class LuceneDescendant extends Descendant implements LuceneQueryBuilderCo
|
||||
throw new QueryModelException("Invalid Object Id "+id);
|
||||
}
|
||||
}
|
||||
if(!functionContext.getNodeService().exists(nodeRef))
|
||||
{
|
||||
throw new QueryModelException("Object does not exist: "+id);
|
||||
}
|
||||
Path path = functionContext.getNodeService().getPath(nodeRef);
|
||||
StringBuilder builder = new StringBuilder(path.toPrefixString(luceneContext.getNamespacePrefixResolver()));
|
||||
builder.append("//*");
|
||||
|
@@ -33,6 +33,7 @@ import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
|
||||
import org.alfresco.repo.search.impl.querymodel.Argument;
|
||||
import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
|
||||
import org.alfresco.repo.search.impl.querymodel.ListArgument;
|
||||
import org.alfresco.repo.search.impl.querymodel.LiteralArgument;
|
||||
import org.alfresco.repo.search.impl.querymodel.PredicateMode;
|
||||
import org.alfresco.repo.search.impl.querymodel.PropertyArgument;
|
||||
import org.alfresco.repo.search.impl.querymodel.QueryModelException;
|
||||
@@ -58,10 +59,10 @@ public class LuceneIn extends In implements LuceneQueryBuilderComponent
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(org.apache.lucene.search.BooleanQuery,
|
||||
* org.apache.lucene.search.BooleanQuery, org.alfresco.service.cmr.dictionary.DictionaryService,
|
||||
* java.lang.String)
|
||||
* @see
|
||||
* org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(org.apache.lucene
|
||||
* .search.BooleanQuery, org.apache.lucene.search.BooleanQuery,
|
||||
* org.alfresco.service.cmr.dictionary.DictionaryService, java.lang.String)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Query addComponent(Set<String> selectors, Map<String, Argument> functionArgs, LuceneQueryBuilderContext luceneContext, FunctionEvaluationContext functionContext)
|
||||
@@ -71,11 +72,14 @@ public class LuceneIn extends In implements LuceneQueryBuilderComponent
|
||||
PropertyArgument propertyArgument = (PropertyArgument) functionArgs.get(ARG_PROPERTY);
|
||||
Argument inverseArgument = functionArgs.get(ARG_NOT);
|
||||
Boolean not = DefaultTypeConverter.INSTANCE.convert(Boolean.class, inverseArgument.getValue(functionContext));
|
||||
LiteralArgument modeArgument = (LiteralArgument) functionArgs.get(ARG_MODE);
|
||||
String modeString = DefaultTypeConverter.INSTANCE.convert(String.class, modeArgument.getValue(functionContext));
|
||||
PredicateMode mode = PredicateMode.valueOf(modeString);
|
||||
|
||||
ListArgument listArgument = (ListArgument)functionArgs.get(ARG_LIST);
|
||||
Collection<Serializable> collection = (Collection<Serializable>)listArgument.getValue(functionContext);
|
||||
|
||||
Query query = functionContext.buildLuceneIn(lqp, propertyArgument.getPropertyName(), collection, not, PredicateMode.ANY);
|
||||
ListArgument listArgument = (ListArgument) functionArgs.get(ARG_LIST);
|
||||
Collection<Serializable> collection = (Collection<Serializable>) listArgument.getValue(functionContext);
|
||||
|
||||
Query query = functionContext.buildLuceneIn(lqp, propertyArgument.getPropertyName(), collection, not, mode);
|
||||
|
||||
if (query == null)
|
||||
{
|
||||
|
@@ -24,12 +24,22 @@
|
||||
*/
|
||||
package org.alfresco.repo.search.impl.querymodel.impl.lucene.functions;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
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.search.impl.querymodel.impl.functions.Lower;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext;
|
||||
import org.apache.lucene.queryParser.ParseException;
|
||||
import org.apache.lucene.search.Query;
|
||||
|
||||
/**
|
||||
* @author andyh
|
||||
*/
|
||||
public class LuceneLower extends Lower
|
||||
public class LuceneLower extends Lower implements LuceneQueryBuilderComponent
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -40,4 +50,15 @@ public class LuceneLower extends Lower
|
||||
super();
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(java.util.Set,
|
||||
* java.util.Map, org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext,
|
||||
* org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext)
|
||||
*/
|
||||
public Query addComponent(Set<String> selectors, Map<String, Argument> functionArgs, LuceneQueryBuilderContext luceneContext, FunctionEvaluationContext functionContext)
|
||||
throws ParseException
|
||||
{
|
||||
throw new QueryModelException("Unsupported function in query " + getName());
|
||||
}
|
||||
}
|
||||
|
@@ -24,12 +24,22 @@
|
||||
*/
|
||||
package org.alfresco.repo.search.impl.querymodel.impl.lucene.functions;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
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.search.impl.querymodel.impl.functions.PropertyAccessor;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext;
|
||||
import org.apache.lucene.queryParser.ParseException;
|
||||
import org.apache.lucene.search.Query;
|
||||
|
||||
/**
|
||||
* @author andyh
|
||||
*/
|
||||
public class LucenePropertyAccessor extends PropertyAccessor
|
||||
public class LucenePropertyAccessor extends PropertyAccessor implements LuceneQueryBuilderComponent
|
||||
{
|
||||
/**
|
||||
*
|
||||
@@ -38,4 +48,13 @@ public class LucenePropertyAccessor extends PropertyAccessor
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext)
|
||||
*/
|
||||
public Query addComponent(Set<String> selectors, Map<String, Argument> functionArgs, LuceneQueryBuilderContext luceneContext, FunctionEvaluationContext functionContext)
|
||||
throws ParseException
|
||||
{
|
||||
throw new QueryModelException("Unsupported function in query "+getName());
|
||||
}
|
||||
}
|
||||
|
@@ -24,13 +24,23 @@
|
||||
*/
|
||||
package org.alfresco.repo.search.impl.querymodel.impl.lucene.functions;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
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.search.impl.querymodel.impl.functions.Score;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext;
|
||||
import org.apache.lucene.queryParser.ParseException;
|
||||
import org.apache.lucene.search.Query;
|
||||
|
||||
/**
|
||||
* @author andyh
|
||||
*
|
||||
*/
|
||||
public class LuceneScore extends Score
|
||||
public class LuceneScore extends Score implements LuceneQueryBuilderComponent
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -40,4 +50,13 @@ public class LuceneScore extends Score
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext)
|
||||
*/
|
||||
public Query addComponent(Set<String> selectors, Map<String, Argument> functionArgs, LuceneQueryBuilderContext luceneContext, FunctionEvaluationContext functionContext)
|
||||
throws ParseException
|
||||
{
|
||||
throw new QueryModelException("Unsupported function in query "+getName());
|
||||
}
|
||||
}
|
||||
|
@@ -24,13 +24,23 @@
|
||||
*/
|
||||
package org.alfresco.repo.search.impl.querymodel.impl.lucene.functions;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
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.search.impl.querymodel.impl.functions.Upper;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent;
|
||||
import org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext;
|
||||
import org.apache.lucene.queryParser.ParseException;
|
||||
import org.apache.lucene.search.Query;
|
||||
|
||||
/**
|
||||
* @author andyh
|
||||
*
|
||||
*/
|
||||
public class LuceneUpper extends Upper
|
||||
public class LuceneUpper extends Upper implements LuceneQueryBuilderComponent
|
||||
{
|
||||
/**
|
||||
*
|
||||
@@ -39,4 +49,13 @@ public class LuceneUpper extends Upper
|
||||
{
|
||||
super();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderComponent#addComponent(java.util.Set, java.util.Map, org.alfresco.repo.search.impl.querymodel.impl.lucene.LuceneQueryBuilderContext, org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext)
|
||||
*/
|
||||
public Query addComponent(Set<String> selectors, Map<String, Argument> functionArgs, LuceneQueryBuilderContext luceneContext, FunctionEvaluationContext functionContext)
|
||||
throws ParseException
|
||||
{
|
||||
throw new QueryModelException("Unsupported function in query "+getName());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user