Cleany split CMIS Interfaces from implementation (part 2)

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

source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java

@@ -37,7 +37,7 @@ import org.alfresco.cmis.CMISTypeDefinition;
 import org.alfresco.cmis.CMISUpdatabilityEnum;
 import org.alfresco.cmis.CMISPropertyAccessor;
 import org.alfresco.cmis.CMISPropertyLuceneBuilder;
-import org.alfresco.cmis.mapping.AbstractPropertyAccessor;
+import org.alfresco.cmis.mapping.AbstractProperty;
 import org.alfresco.cmis.mapping.CMISMapping;
 import org.alfresco.repo.dictionary.IndexTokenisationMode;
 import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
@@ -79,7 +79,7 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria
     private CMISUpdatabilityEnum updatability;
     private boolean queryable;
     private boolean orderable;
-    private AbstractPropertyAccessor propertyAccessor;
+    private AbstractProperty propertyAccessor;
 
     
     /**

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

@@ -35,7 +35,7 @@ import org.alfresco.service.namespace.QName;
  * @author andyh
  *
  */
-public abstract class AbstractPropertyAccessor implements CMISPropertyAccessor, CMISPropertyLuceneBuilder
+public abstract class AbstractProperty implements CMISPropertyAccessor, CMISPropertyLuceneBuilder
 {
     private ServiceRegistry serviceRegistry;
     private String propertyName;
@@ -46,7 +46,7 @@ public abstract class AbstractPropertyAccessor implements CMISPropertyAccessor,
      * @param serviceRegistry
      * @param propertyName
      */
-    protected AbstractPropertyAccessor(ServiceRegistry serviceRegistry, String propertyName)
+    protected AbstractProperty(ServiceRegistry serviceRegistry, String propertyName)
     {
         this.serviceRegistry = serviceRegistry;
         this.propertyName = propertyName;

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

@@ -101,7 +101,7 @@ public class CMISMapping implements InitializingBean
     private Map<QName, QName> mapCmisQNameToAlfrescoQName = new HashMap<QName, QName>();
     private Map<QName, QName> mapAlfrescoQNameToCmisQName = new HashMap<QName, QName>();
     private Map<QName, CMISDataTypeEnum> mapAlfrescoToCmisDataType = new HashMap<QName, CMISDataTypeEnum>();
-    private Map<String, AbstractPropertyAccessor> propertyAccessors = new HashMap<String, AbstractPropertyAccessor>();
+    private Map<String, AbstractProperty> propertyAccessors = new HashMap<String, AbstractProperty>();
     
     
     /*
@@ -148,32 +148,32 @@ public class CMISMapping implements InitializingBean
         mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_XML, CMISDataTypeEnum.XML);
         mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_HTML, CMISDataTypeEnum.HTML);
 
-        registerPropertyAccessor(new ObjectIdPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ObjectIdProperty(serviceRegistry));
-        registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_URI, null));
+        registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_URI, null));
-        registerPropertyAccessor(new ObjectTypeIdPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ObjectTypeIdProperty(serviceRegistry));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CREATED_BY, ContentModel.PROP_CREATOR));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CREATED_BY, ContentModel.PROP_CREATOR));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CREATION_DATE, ContentModel.PROP_CREATED));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CREATION_DATE, ContentModel.PROP_CREATED));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFIED_BY, ContentModel.PROP_MODIFIER));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFIED_BY, ContentModel.PROP_MODIFIER));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFICATION_DATE, ContentModel.PROP_MODIFIED));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFICATION_DATE, ContentModel.PROP_MODIFIED));
-        registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CHANGE_TOKEN, null));
+        registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_CHANGE_TOKEN, null));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_NAME, ContentModel.PROP_NAME));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_NAME, ContentModel.PROP_NAME));
-        registerPropertyAccessor(new IsImmutablePropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new IsImmutableProperty(serviceRegistry));
-        registerPropertyAccessor(new IsLatestVersionPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new IsLatestVersionProperty(serviceRegistry));
-        registerPropertyAccessor(new IsMajorVersionPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new IsMajorVersionProperty(serviceRegistry));
-        registerPropertyAccessor(new IsLatestMajorVersionPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new IsLatestMajorVersionProperty(serviceRegistry));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_VERSION_LABEL, ContentModel.PROP_VERSION_LABEL));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_VERSION_LABEL, ContentModel.PROP_VERSION_LABEL));
-        registerPropertyAccessor(new VersionSeriesIdPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new VersionSeriesIdProperty(serviceRegistry));
-        registerPropertyAccessor(new IsVersionSeriesCheckedOutPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new IsVersionSeriesCheckedOutProperty(serviceRegistry));
-        registerPropertyAccessor(new VersionSeriesCheckedOutByPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new VersionSeriesCheckedOutByProperty(serviceRegistry));
-        registerPropertyAccessor(new VersionSeriesCheckedOutIdPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new VersionSeriesCheckedOutIdProperty(serviceRegistry));
-        registerPropertyAccessor(new CheckinCommentPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new CheckinCommentProperty(serviceRegistry));
-        registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_ALLOWED, CMISContentStreamAllowedEnum.ALLOWED.toString()));
+        registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_ALLOWED, CMISContentStreamAllowedEnum.ALLOWED.toString()));
-        registerPropertyAccessor(new ContentStreamLengthPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ContentStreamLengthProperty(serviceRegistry));
-        registerPropertyAccessor(new ContentStreamMimetypePropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ContentStreamMimetypeProperty(serviceRegistry));
-        registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME, ContentModel.PROP_NAME));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME, ContentModel.PROP_NAME));
-        registerPropertyAccessor(new ContentStreamUriPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ContentStreamUriProperty(serviceRegistry));
-        registerPropertyAccessor(new ParentPropertyAccessor(serviceRegistry));
+        registerPropertyAccessor(new ParentProperty(serviceRegistry));
-        registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS, null));
+        registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS, null));
     }
 
 
@@ -653,9 +653,9 @@ public class CMISMapping implements InitializingBean
      * @param propertyId
      * @return
      */
-    public AbstractPropertyAccessor getPropertyAccessor(CMISPropertyId propertyId)
+    public AbstractProperty getPropertyAccessor(CMISPropertyId propertyId)
     {
-        AbstractPropertyAccessor propertyAccessor = propertyAccessors.get(propertyId.getName());
+        AbstractProperty propertyAccessor = propertyAccessors.get(propertyId.getName());
         if (propertyAccessor == null)
         {
             QName propertyQName = propertyId.getQName();
@@ -663,7 +663,7 @@ public class CMISMapping implements InitializingBean
             {
                 throw new AlfrescoRuntimeException("Can't get property accessor for property id " + propertyId.getName() + " due to unknown property QName");
             }
-            propertyAccessor = new DirectPropertyAccessor(serviceRegistry, propertyId.getName(), propertyQName);
+            propertyAccessor = new DirectProperty(serviceRegistry, propertyId.getName(), propertyQName);
         }
         return propertyAccessor;
     }
@@ -673,7 +673,7 @@ public class CMISMapping implements InitializingBean
      * 
      * @param propertyAccessor
      */
-    private void registerPropertyAccessor(AbstractPropertyAccessor propertyAccessor)
+    private void registerPropertyAccessor(AbstractProperty propertyAccessor)
     {
         propertyAccessors.put(propertyAccessor.getName(), propertyAccessor);
     }

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

@@ -40,14 +40,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class CheckinCommentPropertyAccessor extends AbstractPropertyAccessor
+public class CheckinCommentProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public CheckinCommentPropertyAccessor(ServiceRegistry serviceRegistry)
+    public CheckinCommentProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_CHECKIN_COMMENT);
     }

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

@@ -49,14 +49,14 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * 
  * @author andyh
  */
-public class ContentStreamLengthPropertyAccessor extends AbstractPropertyAccessor
+public class ContentStreamLengthProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public ContentStreamLengthPropertyAccessor(ServiceRegistry serviceRegistry)
+    public ContentStreamLengthProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_LENGTH);
     }

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

@@ -49,14 +49,14 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * 
  * @author andyh
  */
-public class ContentStreamMimetypePropertyAccessor extends AbstractPropertyAccessor
+public class ContentStreamMimetypeProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public ContentStreamMimetypePropertyAccessor(ServiceRegistry serviceRegistry)
+    public ContentStreamMimetypeProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_MIME_TYPE);
     }

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

@@ -33,7 +33,6 @@ 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.repository.NodeRef;
-import org.apache.lucene.queryParser.ParseException;
 import org.apache.lucene.search.Query;
 
 /**
@@ -41,14 +40,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class ContentStreamUriPropertyAccessor extends AbstractPropertyAccessor
+public class ContentStreamUriProperty extends AbstractProperty
 {
     /**
      * Construct 
      *  
      * @param serviceRegistry
      */
-    public ContentStreamUriPropertyAccessor(ServiceRegistry serviceRegistry)
+    public ContentStreamUriProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_URI);
     }

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

@@ -47,7 +47,7 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * 
  * @author andyh
  */
-public class DirectPropertyAccessor extends AbstractPropertyAccessor
+public class DirectProperty extends AbstractProperty
 {
     private QName alfrescoName;
 
@@ -58,7 +58,7 @@ public class DirectPropertyAccessor extends AbstractPropertyAccessor
      * @param propertyName
      * @param alfrescoName
      */
-    public DirectPropertyAccessor(ServiceRegistry serviceRegistry, String propertyName, QName alfrescoName)
+    public DirectProperty(ServiceRegistry serviceRegistry, String propertyName, QName alfrescoName)
     {
         super(serviceRegistry, propertyName);
         this.alfrescoName = alfrescoName;

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

@@ -47,7 +47,7 @@ import org.apache.lucene.search.TermQuery;
  * 
  * @author andyh
  */
-public class FixedValuePropertyAccessor extends AbstractPropertyAccessor
+public class FixedValueProperty extends AbstractProperty
 {
     private Serializable value;
     
@@ -58,7 +58,7 @@ public class FixedValuePropertyAccessor extends AbstractPropertyAccessor
      * @param propertyName
      * @param value
      */
-    public FixedValuePropertyAccessor(ServiceRegistry serviceRegistry, String propertyName, Serializable value)
+    public FixedValueProperty(ServiceRegistry serviceRegistry, String propertyName, Serializable value)
     {
         super(serviceRegistry, propertyName);
         this.value = value;

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

@@ -42,14 +42,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class IsImmutablePropertyAccessor extends AbstractPropertyAccessor
+public class IsImmutableProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public IsImmutablePropertyAccessor(ServiceRegistry serviceRegistry)
+    public IsImmutableProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_IS_IMMUTABLE);
     }

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

@@ -42,14 +42,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class IsLatestMajorVersionPropertyAccessor extends AbstractPropertyAccessor
+public class IsLatestMajorVersionProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public IsLatestMajorVersionPropertyAccessor(ServiceRegistry serviceRegistry)
+    public IsLatestMajorVersionProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_IS_LATEST_MAJOR_VERSION);
     }

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

@@ -40,14 +40,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class IsLatestVersionPropertyAccessor extends AbstractPropertyAccessor
+public class IsLatestVersionProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public IsLatestVersionPropertyAccessor(ServiceRegistry serviceRegistry)
+    public IsLatestVersionProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_IS_LATEST_VERSION);
     }

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

@@ -42,14 +42,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class IsMajorVersionPropertyAccessor extends AbstractPropertyAccessor
+public class IsMajorVersionProperty extends AbstractProperty
 {
     /**
      * Construct
      *
      * @param serviceRegistry
      */
-    public IsMajorVersionPropertyAccessor(ServiceRegistry serviceRegistry)
+    public IsMajorVersionProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_IS_MAJOR_VERSION);
     }

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

@@ -41,14 +41,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class IsVersionSeriesCheckedOutPropertyAccessor extends AbstractPropertyAccessor
+public class IsVersionSeriesCheckedOutProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public IsVersionSeriesCheckedOutPropertyAccessor(ServiceRegistry serviceRegistry)
+    public IsVersionSeriesCheckedOutProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_IS_VERSION_SERIES_CHECKED_OUT);
     }

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

@@ -49,14 +49,14 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * 
  * @author andyh
  */
-public class ObjectIdPropertyAccessor extends AbstractPropertyAccessor
+public class ObjectIdProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public ObjectIdPropertyAccessor(ServiceRegistry serviceRegistry)
+    public ObjectIdProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_OBJECT_ID);
     }

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

@@ -50,14 +50,14 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * 
  * @author andyh
  */
-public class ObjectTypeIdPropertyAccessor extends AbstractPropertyAccessor
+public class ObjectTypeIdProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public ObjectTypeIdPropertyAccessor(ServiceRegistry serviceRegistry)
+    public ObjectTypeIdProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_OBJECT_TYPE_ID);
     }

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

@@ -49,14 +49,14 @@ import org.apache.lucene.search.BooleanClause.Occur;
  * @author andyh
  *
  */
-public class ParentPropertyAccessor extends AbstractPropertyAccessor
+public class ParentProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public ParentPropertyAccessor(ServiceRegistry serviceRegistry)
+    public ParentProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_PARENT_ID);
     }

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

@@ -41,14 +41,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class VersionSeriesCheckedOutByPropertyAccessor extends AbstractPropertyAccessor
+public class VersionSeriesCheckedOutByProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public VersionSeriesCheckedOutByPropertyAccessor(ServiceRegistry serviceRegistry)
+    public VersionSeriesCheckedOutByProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_VERSION_SERIES_CHECKED_OUT_BY);
     }

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

@@ -41,14 +41,14 @@ import org.apache.lucene.search.Query;
  * 
  * @author andyh
  */
-public class VersionSeriesCheckedOutIdPropertyAccessor extends AbstractPropertyAccessor
+public class VersionSeriesCheckedOutIdProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public VersionSeriesCheckedOutIdPropertyAccessor(ServiceRegistry serviceRegistry)
+    public VersionSeriesCheckedOutIdProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_VERSION_SERIES_CHECKED_OUT_ID);
     }

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

@@ -38,14 +38,14 @@ import org.apache.lucene.search.Query;
 /**
  * @author andyh
  */
-public class VersionSeriesIdPropertyAccessor extends AbstractPropertyAccessor
+public class VersionSeriesIdProperty extends AbstractProperty
 {
     /**
      * Construct
      * 
      * @param serviceRegistry
      */
-    public VersionSeriesIdPropertyAccessor(ServiceRegistry serviceRegistry)
+    public VersionSeriesIdProperty(ServiceRegistry serviceRegistry)
     {
         super(serviceRegistry, CMISDictionaryModel.PROP_VERSION_SERIES_ID);
     }