Refactor CMIS property accessors to remove duplicate code. Basic wire up for fts query language and some simple tests (MOB-574). Parser WIP (MOB-571)

- added support for properties and column aliases in CMIS embedded FTS
- simple pass-through column support for FTS

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/cmis/mapping/DirectProperty.java

@@ -25,29 +25,20 @@
 package org.alfresco.cmis.mapping;
 
 import java.io.Serializable;
-import java.util.Collection;
 
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
-import org.alfresco.repo.search.impl.querymodel.PredicateMode;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.BooleanClause.Occur;
 
 /**
  * A simple 1-1 property mapping from a CMIS property name to an alfresco property
  * 
  * @author andyh
  */
-public class DirectProperty extends AbstractProperty
+public class DirectProperty extends AbstractSimpleProperty
 {
     private QName alfrescoName;
 
@@ -66,15 +57,17 @@ public class DirectProperty extends AbstractProperty
 
     /*
      * (non-Javadoc)
+     * 
      * @see org.alfresco.cmis.property.AbstractPropertyAccessor#getMappedProperty()
      */
     public QName getMappedProperty()
     {
         return alfrescoName;
     }
-    
+
     /*
      * (non-Javadoc)
+     * 
      * @see org.alfresco.cmis.property.PropertyAccessor#getValue(org.alfresco.service.cmr.repository.NodeRef)
      */
     public Serializable getValue(NodeRef nodeRef)
@@ -82,16 +75,7 @@ public class DirectProperty extends AbstractProperty
         return getServiceRegistry().getNodeService().getProperty(nodeRef, alfrescoName);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyAccessor#setValue(org.alfresco.service.cmr.repository.NodeRef, java.io.Serializable)
-     */
-    public void setValue(NodeRef nodeRef, Serializable value)
-    {
-        throw new UnsupportedOperationException();
-    }
-    
-    private String getLuceneFieldName()
+    public String getLuceneFieldName()
     {
         StringBuilder field = new StringBuilder(64);
         field.append("@");
@@ -99,7 +83,7 @@ public class DirectProperty extends AbstractProperty
         return field.toString();
     }
 
-    private String getValueAsString(Serializable value)
+    protected String getValueAsString(Serializable value)
     {
         PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(alfrescoName);
         Object converted = DefaultTypeConverter.INSTANCE.convert(pd.getDataType(), value);
@@ -107,175 +91,17 @@ public class DirectProperty extends AbstractProperty
         return asString;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneEquality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneEquality(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
+    protected QName getQNameForExists()
     {
-        return lqp.getFieldQuery(getLuceneFieldName(), getValueAsString(value));
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneExists(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.lang.Boolean)
-     */
-    public Query buildLuceneExists(LuceneQueryParser lqp, Boolean not) throws ParseException
-    {
-        if (not)
-        {
-            return lqp.getFieldQuery("ISNULL", alfrescoName.toString());
-        }
-        else
-        {
-            return lqp.getFieldQuery("ISNOTNULL", alfrescoName.toString());
-        }
+        return alfrescoName;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneGreaterThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
+    protected DataTypeDefinition getInDataType()
     {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-        return lqp.getRangeQuery(field, stringValue, "\uFFFF", false, true);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneGreaterThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneGreaterThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
-    {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-        return lqp.getRangeQuery(field, stringValue, "\uFFFF", true, true);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneIn(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.util.Collection, java.lang.Boolean, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneIn(LuceneQueryParser lqp, Collection<Serializable> values, Boolean not, PredicateMode mode) throws ParseException
-    {
-        String field = getLuceneFieldName();
         PropertyDefinition pd = getServiceRegistry().getDictionaryService().getProperty(alfrescoName);
-
-        // Check type conversion
-
-        @SuppressWarnings("unused")
-        Object converted = DefaultTypeConverter.INSTANCE.convert(pd.getDataType(), values);
-        Collection<String> asStrings = DefaultTypeConverter.INSTANCE.convert(String.class, values);
-
-        if (asStrings.size() == 0)
-        {
-            if (not)
-            {
-                return new MatchAllDocsQuery();
-            }
-            else
-            {
-                return new TermQuery(new Term("NO_TOKENS", "__"));
-            }
-        }
-        else if (asStrings.size() == 1)
-        {
-            String value = asStrings.iterator().next();
-            if (not)
-            {
-                return lqp.getDoesNotMatchFieldQuery(field, value);
-            }
-            else
-            {
-                return lqp.getFieldQuery(field, value);
-            }
-        }
-        else
-        {
-            BooleanQuery booleanQuery = new BooleanQuery();
-            if (not)
-            {
-                booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST);
-            }
-            for (String value : asStrings)
-            {
-                Query any = lqp.getFieldQuery(field, value);
-                if (not)
-                {
-                    booleanQuery.add(any, Occur.MUST_NOT);
-                }
-                else
-                {
-                    booleanQuery.add(any, Occur.SHOULD);
-                }
-            }
-            return booleanQuery;
-        }
+        return pd.getDataType();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneInequality(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneInequality(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
-    {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-        return lqp.getDoesNotMatchFieldQuery(field, stringValue);
-    }
+    
 
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThan(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneLessThan(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
-    {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-        return lqp.getRangeQuery(field, "\u0000", stringValue, true, false);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLessThanOrEquals(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, org.alfresco.repo.search.impl.querymodel.PredicateMode)
-     */
-    public Query buildLuceneLessThanOrEquals(LuceneQueryParser lqp, Serializable value, PredicateMode mode) throws ParseException
-    {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-        return lqp.getRangeQuery(field, "\u0000", stringValue, true, true);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#buildLuceneLike(org.alfresco.repo.search.impl.lucene.LuceneQueryParser, java.io.Serializable, java.lang.Boolean)
-     */
-    public Query buildLuceneLike(LuceneQueryParser lqp, Serializable value, Boolean not) throws ParseException
-    {
-        String field = getLuceneFieldName();
-        String stringValue = getValueAsString(value);
-
-        if (not)
-        {
-            BooleanQuery booleanQuery = new BooleanQuery();
-            booleanQuery.add(new MatchAllDocsQuery(), Occur.MUST);
-            booleanQuery.add(lqp.getLikeQuery(field, stringValue), Occur.MUST_NOT);
-            return booleanQuery;
-        }
-        else
-        {
-            return lqp.getLikeQuery(field, stringValue);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.alfresco.cmis.property.PropertyLuceneBuilder#getLuceneSortField()
-     */
-    public String getLuceneSortField()
-    {
-        return getLuceneFieldName();
-    }
 }