From 440af3f96cd218d00d124ddb897327ef54620ddb Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 2 Apr 2009 14:02:52 +0000 Subject: [PATCH] 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 --- .../CMISBasePropertyDefinition.java | 4 +- ...rtyAccessor.java => AbstractProperty.java} | 4 +- .../alfresco/cmis/mapping/CMISMapping.java | 62 +++++++++---------- ...essor.java => CheckinCommentProperty.java} | 4 +- ....java => ContentStreamLengthProperty.java} | 4 +- ...ava => ContentStreamMimetypeProperty.java} | 4 +- ...sor.java => ContentStreamUriProperty.java} | 5 +- ...pertyAccessor.java => DirectProperty.java} | 4 +- ...yAccessor.java => FixedValueProperty.java} | 4 +- ...Accessor.java => IsImmutableProperty.java} | 4 +- ...java => IsLatestMajorVersionProperty.java} | 4 +- ...ssor.java => IsLatestVersionProperty.java} | 4 +- ...essor.java => IsMajorVersionProperty.java} | 4 +- ...=> IsVersionSeriesCheckedOutProperty.java} | 4 +- ...rtyAccessor.java => ObjectIdProperty.java} | 4 +- ...ccessor.java => ObjectTypeIdProperty.java} | 4 +- ...pertyAccessor.java => ParentProperty.java} | 4 +- ...=> VersionSeriesCheckedOutByProperty.java} | 4 +- ...=> VersionSeriesCheckedOutIdProperty.java} | 4 +- ...ssor.java => VersionSeriesIdProperty.java} | 4 +- 20 files changed, 69 insertions(+), 70 deletions(-) rename source/java/org/alfresco/cmis/mapping/{AbstractPropertyAccessor.java => AbstractProperty.java} (89%) rename source/java/org/alfresco/cmis/mapping/{CheckinCommentPropertyAccessor.java => CheckinCommentProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{ContentStreamLengthPropertyAccessor.java => ContentStreamLengthProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{ContentStreamMimetypePropertyAccessor.java => ContentStreamMimetypeProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{ContentStreamUriPropertyAccessor.java => ContentStreamUriProperty.java} (96%) rename source/java/org/alfresco/cmis/mapping/{DirectPropertyAccessor.java => DirectProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{FixedValuePropertyAccessor.java => FixedValueProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{IsImmutablePropertyAccessor.java => IsImmutableProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{IsLatestMajorVersionPropertyAccessor.java => IsLatestMajorVersionProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{IsLatestVersionPropertyAccessor.java => IsLatestVersionProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{IsMajorVersionPropertyAccessor.java => IsMajorVersionProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{IsVersionSeriesCheckedOutPropertyAccessor.java => IsVersionSeriesCheckedOutProperty.java} (94%) rename source/java/org/alfresco/cmis/mapping/{ObjectIdPropertyAccessor.java => ObjectIdProperty.java} (96%) rename source/java/org/alfresco/cmis/mapping/{ObjectTypeIdPropertyAccessor.java => ObjectTypeIdProperty.java} (96%) rename source/java/org/alfresco/cmis/mapping/{ParentPropertyAccessor.java => ParentProperty.java} (96%) rename source/java/org/alfresco/cmis/mapping/{VersionSeriesCheckedOutByPropertyAccessor.java => VersionSeriesCheckedOutByProperty.java} (95%) rename source/java/org/alfresco/cmis/mapping/{VersionSeriesCheckedOutIdPropertyAccessor.java => VersionSeriesCheckedOutIdProperty.java} (94%) rename source/java/org/alfresco/cmis/mapping/{VersionSeriesIdPropertyAccessor.java => VersionSeriesIdProperty.java} (95%) diff --git a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java b/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java index 12d6e94d4c..32d8a762cf 100644 --- a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java +++ b/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; /** diff --git a/source/java/org/alfresco/cmis/mapping/AbstractPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/AbstractProperty.java similarity index 89% rename from source/java/org/alfresco/cmis/mapping/AbstractPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/AbstractProperty.java index b237f39c3c..ee102d4b52 100644 --- a/source/java/org/alfresco/cmis/mapping/AbstractPropertyAccessor.java +++ b/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; diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java index 412c175427..88a2073b49 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java +++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java @@ -101,7 +101,7 @@ public class CMISMapping implements InitializingBean private Map mapCmisQNameToAlfrescoQName = new HashMap(); private Map mapAlfrescoQNameToCmisQName = new HashMap(); private Map mapAlfrescoToCmisDataType = new HashMap(); - private Map propertyAccessors = new HashMap(); + private Map propertyAccessors = new HashMap(); /* @@ -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 FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_URI, null)); - registerPropertyAccessor(new ObjectTypeIdPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CREATED_BY, ContentModel.PROP_CREATOR)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CREATION_DATE, ContentModel.PROP_CREATED)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFIED_BY, ContentModel.PROP_MODIFIER)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFICATION_DATE, ContentModel.PROP_MODIFIED)); - registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CHANGE_TOKEN, null)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_NAME, ContentModel.PROP_NAME)); - registerPropertyAccessor(new IsImmutablePropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new IsLatestVersionPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new IsMajorVersionPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new IsLatestMajorVersionPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_VERSION_LABEL, ContentModel.PROP_VERSION_LABEL)); - registerPropertyAccessor(new VersionSeriesIdPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new IsVersionSeriesCheckedOutPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new VersionSeriesCheckedOutByPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new VersionSeriesCheckedOutIdPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new CheckinCommentPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_ALLOWED, CMISContentStreamAllowedEnum.ALLOWED.toString())); - registerPropertyAccessor(new ContentStreamLengthPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new ContentStreamMimetypePropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new DirectPropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME, ContentModel.PROP_NAME)); - registerPropertyAccessor(new ContentStreamUriPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new ParentPropertyAccessor(serviceRegistry)); - registerPropertyAccessor(new FixedValuePropertyAccessor(serviceRegistry, CMISDictionaryModel.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS, null)); + registerPropertyAccessor(new ObjectIdProperty(serviceRegistry)); + registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_URI, null)); + registerPropertyAccessor(new ObjectTypeIdProperty(serviceRegistry)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CREATED_BY, ContentModel.PROP_CREATOR)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CREATION_DATE, ContentModel.PROP_CREATED)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFIED_BY, ContentModel.PROP_MODIFIER)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_LAST_MODIFICATION_DATE, ContentModel.PROP_MODIFIED)); + registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_CHANGE_TOKEN, null)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_NAME, ContentModel.PROP_NAME)); + registerPropertyAccessor(new IsImmutableProperty(serviceRegistry)); + registerPropertyAccessor(new IsLatestVersionProperty(serviceRegistry)); + registerPropertyAccessor(new IsMajorVersionProperty(serviceRegistry)); + registerPropertyAccessor(new IsLatestMajorVersionProperty(serviceRegistry)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_VERSION_LABEL, ContentModel.PROP_VERSION_LABEL)); + registerPropertyAccessor(new VersionSeriesIdProperty(serviceRegistry)); + registerPropertyAccessor(new IsVersionSeriesCheckedOutProperty(serviceRegistry)); + registerPropertyAccessor(new VersionSeriesCheckedOutByProperty(serviceRegistry)); + registerPropertyAccessor(new VersionSeriesCheckedOutIdProperty(serviceRegistry)); + registerPropertyAccessor(new CheckinCommentProperty(serviceRegistry)); + registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_ALLOWED, CMISContentStreamAllowedEnum.ALLOWED.toString())); + registerPropertyAccessor(new ContentStreamLengthProperty(serviceRegistry)); + registerPropertyAccessor(new ContentStreamMimetypeProperty(serviceRegistry)); + registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME, ContentModel.PROP_NAME)); + registerPropertyAccessor(new ContentStreamUriProperty(serviceRegistry)); + registerPropertyAccessor(new ParentProperty(serviceRegistry)); + 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); } diff --git a/source/java/org/alfresco/cmis/mapping/CheckinCommentPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/CheckinCommentProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/CheckinCommentPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/CheckinCommentProperty.java index ef77c6c8c4..ce277ae39e 100644 --- a/source/java/org/alfresco/cmis/mapping/CheckinCommentPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ContentStreamLengthPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ContentStreamLengthProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/ContentStreamLengthPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ContentStreamLengthProperty.java index f56a60fc0d..6215632774 100644 --- a/source/java/org/alfresco/cmis/mapping/ContentStreamLengthPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ContentStreamMimetypePropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ContentStreamMimetypeProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/ContentStreamMimetypePropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ContentStreamMimetypeProperty.java index ea230f832a..f7259dc167 100644 --- a/source/java/org/alfresco/cmis/mapping/ContentStreamMimetypePropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ContentStreamUriPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ContentStreamUriProperty.java similarity index 96% rename from source/java/org/alfresco/cmis/mapping/ContentStreamUriPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ContentStreamUriProperty.java index 48f1e7a6db..94eeec3f7d 100644 --- a/source/java/org/alfresco/cmis/mapping/ContentStreamUriPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/DirectPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/DirectProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/DirectPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/DirectProperty.java index 57ea912a2d..ac2c39373c 100644 --- a/source/java/org/alfresco/cmis/mapping/DirectPropertyAccessor.java +++ b/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; diff --git a/source/java/org/alfresco/cmis/mapping/FixedValuePropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/FixedValueProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/FixedValuePropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/FixedValueProperty.java index 41a1526506..fca975e455 100644 --- a/source/java/org/alfresco/cmis/mapping/FixedValuePropertyAccessor.java +++ b/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; diff --git a/source/java/org/alfresco/cmis/mapping/IsImmutablePropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/IsImmutableProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/IsImmutablePropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/IsImmutableProperty.java index 3ff4ea7b0f..af26d9317f 100644 --- a/source/java/org/alfresco/cmis/mapping/IsImmutablePropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionProperty.java index f78f443b3d..ba219631c9 100644 --- a/source/java/org/alfresco/cmis/mapping/IsLatestMajorVersionPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/IsLatestVersionPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/IsLatestVersionProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/IsLatestVersionPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/IsLatestVersionProperty.java index eb7eabd59f..fa96b3a686 100644 --- a/source/java/org/alfresco/cmis/mapping/IsLatestVersionPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/IsMajorVersionPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/IsMajorVersionProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/IsMajorVersionPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/IsMajorVersionProperty.java index 9d53e6e032..cee13de405 100644 --- a/source/java/org/alfresco/cmis/mapping/IsMajorVersionPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/IsVersionSeriesCheckedOutPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/IsVersionSeriesCheckedOutProperty.java similarity index 94% rename from source/java/org/alfresco/cmis/mapping/IsVersionSeriesCheckedOutPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/IsVersionSeriesCheckedOutProperty.java index 2bb0dc0358..178b2eb05d 100644 --- a/source/java/org/alfresco/cmis/mapping/IsVersionSeriesCheckedOutPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ObjectIdPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java similarity index 96% rename from source/java/org/alfresco/cmis/mapping/ObjectIdPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ObjectIdProperty.java index 4b5c40a151..7b841aa171 100644 --- a/source/java/org/alfresco/cmis/mapping/ObjectIdPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ObjectTypeIdPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java similarity index 96% rename from source/java/org/alfresco/cmis/mapping/ObjectTypeIdPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ObjectTypeIdProperty.java index a5f4ecfd1b..0725aae3ca 100644 --- a/source/java/org/alfresco/cmis/mapping/ObjectTypeIdPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/ParentPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/ParentProperty.java similarity index 96% rename from source/java/org/alfresco/cmis/mapping/ParentPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/ParentProperty.java index d3cce5b11a..6b6644fda0 100644 --- a/source/java/org/alfresco/cmis/mapping/ParentPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutByPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutByProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutByPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutByProperty.java index d9131e8a3f..fcba7266c1 100644 --- a/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutByPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutIdPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutIdProperty.java similarity index 94% rename from source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutIdPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutIdProperty.java index 1080497c67..55bbe5b941 100644 --- a/source/java/org/alfresco/cmis/mapping/VersionSeriesCheckedOutIdPropertyAccessor.java +++ b/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); } diff --git a/source/java/org/alfresco/cmis/mapping/VersionSeriesIdPropertyAccessor.java b/source/java/org/alfresco/cmis/mapping/VersionSeriesIdProperty.java similarity index 95% rename from source/java/org/alfresco/cmis/mapping/VersionSeriesIdPropertyAccessor.java rename to source/java/org/alfresco/cmis/mapping/VersionSeriesIdProperty.java index 05f846ee0b..6e6f4ede1d 100644 --- a/source/java/org/alfresco/cmis/mapping/VersionSeriesIdPropertyAccessor.java +++ b/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); }