Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -71,6 +71,7 @@ public class ObjectServiceImpl extends A this.portProvider = portProvider; } + @Override public String createDocument(String repositoryId, Properties properties, String folderId, ContentStream contentStream, VersioningState versioningState, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { @@ -96,6 +97,7 @@ public class ObjectServiceImpl extends A } } + @Override public String createDocumentFromSource(String repositoryId, String sourceId, Properties properties, String folderId, VersioningState versioningState, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { @@ -122,6 +124,7 @@ public class ObjectServiceImpl extends A } } + @Override public String createFolder(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "createFolder"); @@ -145,6 +148,7 @@ public class ObjectServiceImpl extends A } } + @Override public String createPolicy(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "createPolicy"); @@ -168,6 +172,7 @@ public class ObjectServiceImpl extends A } } + @Override public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { if (getCmisVersion(repositoryId) == CmisVersion.CMIS_1_0) { @@ -195,6 +200,7 @@ public class ObjectServiceImpl extends A } } + @Override public String createRelationship(String repositoryId, Properties properties, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "createRelationship"); @@ -218,14 +224,15 @@ public class ObjectServiceImpl extends A } } + @Override public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken, Properties properties, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "updateProperties"); try { javax.xml.ws.Holder<String> portObjectId = convertHolder(objectId); - javax.xml.ws.Holder<String> portChangeToken = (getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null - : convertHolder(changeToken)); + javax.xml.ws.Holder<String> portChangeToken = getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null + : convertHolder(changeToken); javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension); port.updateProperties(repositoryId, portObjectId, portChangeToken, convert(properties), portExtension); @@ -242,6 +249,7 @@ public class ObjectServiceImpl extends A } } + @Override public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(String repositoryId, List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties properties, List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds, ExtensionsData extension) { @@ -276,6 +284,7 @@ public class ObjectServiceImpl extends A } } + @Override public void deleteObject(String repositoryId, String objectId, Boolean allVersions, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "deleteObject"); @@ -294,6 +303,7 @@ public class ObjectServiceImpl extends A } } + @Override public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "deleteTree"); @@ -310,6 +320,7 @@ public class ObjectServiceImpl extends A } } + @Override public AllowableActions getAllowableActions(String repositoryId, String objectId, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "getAllowableActions"); @@ -324,6 +335,7 @@ public class ObjectServiceImpl extends A } } + @Override public ContentStream getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset, BigInteger length, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "getContentStream"); @@ -345,6 +357,7 @@ public class ObjectServiceImpl extends A } } + @Override public ObjectData getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) { @@ -363,6 +376,7 @@ public class ObjectServiceImpl extends A } } + @Override public ObjectData getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) { @@ -381,6 +395,7 @@ public class ObjectServiceImpl extends A } } + @Override public Properties getProperties(String repositoryId, String objectId, String filter, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "getProperties"); @@ -395,6 +410,7 @@ public class ObjectServiceImpl extends A } } + @Override public List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "getRenditions"); @@ -424,6 +440,7 @@ public class ObjectServiceImpl extends A } } + @Override public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "moveObject"); @@ -445,14 +462,15 @@ public class ObjectServiceImpl extends A } } + @Override public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag, Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "setContentStream"); try { javax.xml.ws.Holder<String> portObjectId = convertHolder(objectId); - javax.xml.ws.Holder<String> portChangeToken = (getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null - : convertHolder(changeToken)); + javax.xml.ws.Holder<String> portChangeToken = getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null + : convertHolder(changeToken); javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension); port.setContentStream(repositoryId, portObjectId, overwriteFlag, portChangeToken, @@ -470,14 +488,15 @@ public class ObjectServiceImpl extends A } } + @Override public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, ExtensionsData extension) { ObjectServicePort port = portProvider.getObjectServicePort(getCmisVersion(repositoryId), "deleteContentStream"); try { javax.xml.ws.Holder<String> portObjectId = convertHolder(objectId); - javax.xml.ws.Holder<String> portChangeToken = (getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null - : convertHolder(changeToken)); + javax.xml.ws.Holder<String> portChangeToken = getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null + : convertHolder(changeToken); javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension); port.deleteContentStream(repositoryId, portObjectId, portChangeToken, portExtension); @@ -494,6 +513,7 @@ public class ObjectServiceImpl extends A } } + @Override public void appendContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, ContentStream contentStream, boolean isLastChunk, ExtensionsData extension) { if (getCmisVersion(repositoryId) == CmisVersion.CMIS_1_0) { @@ -504,8 +524,8 @@ public class ObjectServiceImpl extends A try { javax.xml.ws.Holder<String> portObjectId = convertHolder(objectId); - javax.xml.ws.Holder<String> portChangeToken = (getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null - : convertHolder(changeToken)); + javax.xml.ws.Holder<String> portChangeToken = getSession().get(SessionParameter.OMIT_CHANGE_TOKENS, false) ? null + : convertHolder(changeToken); javax.xml.ws.Holder<CmisExtensionType> portExtension = convertExtensionHolder(extension); port.appendContentStream(repositoryId, portObjectId, isLastChunk, portChangeToken,
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -52,6 +52,7 @@ public class PolicyServiceImpl extends A this.portProvider = portProvider; } + @Override public void applyPolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) { PolicyServicePort port = portProvider.getPolicyServicePort(getCmisVersion(repositoryId), "applyPolicy"); @@ -70,6 +71,7 @@ public class PolicyServiceImpl extends A } } + @Override public void removePolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) { PolicyServicePort port = portProvider.getPolicyServicePort(getCmisVersion(repositoryId), "removePolicy"); @@ -88,6 +90,7 @@ public class PolicyServiceImpl extends A } } + @Override public List<ObjectData> getAppliedPolicies(String repositoryId, String objectId, String filter, ExtensionsData extension) { PolicyServicePort port = portProvider.getPolicyServicePort(getCmisVersion(repositoryId), "getAppliedPolicies"); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -47,6 +47,7 @@ public class RelationshipServiceImpl ext this.portProvider = portProvider; } + @Override public ObjectList getObjectRelationships(String repositoryId, String objectId, Boolean includeSubRelationshipTypes, RelationshipDirection relationshipDirection, String typeId, String filter, Boolean includeAllowableActions, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -62,6 +62,7 @@ public class RepositoryServiceImpl exten this.portProvider = portProvider; } + @Override public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension) { CmisVersion cmisVersion = CmisBindingsHelper.getForcedCmisVersion(getSession()); if (cmisVersion == null) { @@ -115,6 +116,7 @@ public class RepositoryServiceImpl exten return infos; } + @Override public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) { CmisVersion cmisVersion = CmisBindingsHelper.getForcedCmisVersion(getSession()); if (cmisVersion == null) { @@ -134,6 +136,7 @@ public class RepositoryServiceImpl exten } } + @Override public TypeDefinition getTypeDefinition(String repositoryId, String typeId, ExtensionsData extension) { RepositoryServicePort port = portProvider.getRepositoryServicePort(getCmisVersion(repositoryId), "getTypeDefinition"); @@ -149,6 +152,7 @@ public class RepositoryServiceImpl exten } } + @Override public TypeDefinitionList getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { RepositoryServicePort port = portProvider.getRepositoryServicePort(getCmisVersion(repositoryId), @@ -166,6 +170,7 @@ public class RepositoryServiceImpl exten } } + @Override public List<TypeDefinitionContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth, Boolean includePropertyDefinitions, ExtensionsData extension) { RepositoryServicePort port = portProvider.getRepositoryServicePort(getCmisVersion(repositoryId), @@ -183,6 +188,7 @@ public class RepositoryServiceImpl exten } } + @Override public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) { if (getCmisVersion(repositoryId) == CmisVersion.CMIS_1_0) { throw new CmisNotSupportedException("Repository is a CMIS 1.0 repository!"); @@ -206,6 +212,7 @@ public class RepositoryServiceImpl exten } } + @Override public TypeDefinition updateType(String repositoryId, TypeDefinition type, ExtensionsData extension) { if (getCmisVersion(repositoryId) == CmisVersion.CMIS_1_0) { throw new CmisNotSupportedException("Repository is a CMIS 1.0 repository!"); @@ -229,6 +236,7 @@ public class RepositoryServiceImpl exten } } + @Override public void deleteType(String repositoryId, String typeId, ExtensionsData extension) { if (getCmisVersion(repositoryId) == CmisVersion.CMIS_1_0) { throw new CmisNotSupportedException("Repository is a CMIS 1.0 repository!"); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java Thu Aug 13 12:05:59 2015 @@ -66,6 +66,7 @@ public class SunRIPortProvider extends A /** * Creates a port object. */ + @Override protected BindingProvider createPortObject(CmisServiceHolder serviceHolder) { if (LOG.isDebugEnabled()) { LOG.debug("Session {}: Creating Web Service port object of {} ...", getSession().getSessionId(), Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -58,6 +58,7 @@ public class VersioningServiceImpl exten this.portProvider = portProvider; } + @Override public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension, Holder<Boolean> contentCopied) { VersioningServicePort port = portProvider.getVersioningServicePort(getCmisVersion(repositoryId), "checkOut"); @@ -81,6 +82,7 @@ public class VersioningServiceImpl exten } } + @Override public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) { VersioningServicePort port = portProvider.getVersioningServicePort(getCmisVersion(repositoryId), "cancelCheckOut"); @@ -100,6 +102,7 @@ public class VersioningServiceImpl exten } } + @Override public void checkIn(String repositoryId, Holder<String> objectId, Boolean major, Properties properties, ContentStream contentStream, String checkinComment, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { @@ -123,6 +126,7 @@ public class VersioningServiceImpl exten } } + @Override public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter, Boolean includeAllowableActions, ExtensionsData extension) { VersioningServicePort port = portProvider.getVersioningServicePort(getCmisVersion(repositoryId), @@ -153,6 +157,7 @@ public class VersioningServiceImpl exten } } + @Override public ObjectData getObjectOfLatestVersion(String repositoryId, String objectId, String versionSeriesId, Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) { @@ -172,6 +177,7 @@ public class VersioningServiceImpl exten } } + @Override public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId, Boolean major, String filter, ExtensionsData extension) { VersioningServicePort port = portProvider.getVersioningServicePort(getCmisVersion(repositoryId), Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/WebSpherePortProvider.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/WebSpherePortProvider.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/WebSpherePortProvider.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/WebSpherePortProvider.java Thu Aug 13 12:05:59 2015 @@ -51,6 +51,7 @@ public class WebSpherePortProvider exten /** * Creates a port object. */ + @Override protected BindingProvider createPortObject(CmisServiceHolder serviceHolder) { if (LOG.isDebugEnabled()) { LOG.debug("Creating Web Service port object of " + serviceHolder.getServiceName() + "..."); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java Thu Aug 13 12:05:59 2015 @@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory; /** * Base test case for CMIS tests. - */ + */ public abstract class AbstractCmisTestCase extends TestCase { public static final String DEFAULT_TESTS_ENABLED = "true"; @@ -553,7 +553,7 @@ public abstract class AbstractCmisTestCa assertNotNull(children); assertTrue(isNotEmpty(children.getObjects())); - hasMore = (children.hasMoreItems() == null ? false : children.hasMoreItems().booleanValue()); + hasMore = children.hasMoreItems() == null ? false : children.hasMoreItems().booleanValue(); for (ObjectInFolderData object : children.getObjects()) { assertNotNull(object); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java Thu Aug 13 12:05:59 2015 @@ -84,7 +84,7 @@ public abstract class AbstractSimpleRead return; } - VersioningState vs = (isVersionable(getDefaultDocumentType()) ? VersioningState.MAJOR : VersioningState.NONE); + VersioningState vs = isVersionable(getDefaultDocumentType()) ? VersioningState.MAJOR : VersioningState.NONE; // create document List<PropertyData<?>> propList = new ArrayList<PropertyData<?>>(); @@ -137,7 +137,7 @@ public abstract class AbstractSimpleRead return; } - VersioningState vs = (isVersionable(getDefaultDocumentType()) ? VersioningState.MAJOR : VersioningState.NONE); + VersioningState vs = isVersionable(getDefaultDocumentType()) ? VersioningState.MAJOR : VersioningState.NONE; String docId = createDefaultDocument(getTestRootFolder(), "testdoc.org.txt", CONTENT_TYPE, CONTENT); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/osgi/Activator.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/osgi/Activator.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/osgi/Activator.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/osgi/Activator.java Thu Aug 13 12:05:59 2015 @@ -125,7 +125,7 @@ public class Activator implements Bundle } private List<String> getOpenCmisSpiHeader(final Bundle bundle) { - String spiHeader = (String) bundle.getHeaders().get(OPENCMIS_SPI_HEADER); + String spiHeader = bundle.getHeaders().get(OPENCMIS_SPI_HEADER); if (spiHeader == null) { return null; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java Thu Aug 13 12:05:59 2015 @@ -341,10 +341,12 @@ public abstract class AbstractCmisObject // --- delete --- + @Override public void delete() { delete(true); } + @Override public void delete(boolean allVersions) { readLock(); try { @@ -356,6 +358,7 @@ public abstract class AbstractCmisObject // --- update properties --- + @Override public CmisObject updateProperties(Map<String, ?> properties) { ObjectId objectId = updateProperties(properties, true); if (objectId == null) { @@ -369,6 +372,7 @@ public abstract class AbstractCmisObject return this; } + @Override public ObjectId updateProperties(Map<String, ?> properties, boolean refresh) { if (isNullOrEmpty(properties)) { throw new IllegalArgumentException("Properties must not be empty!"); @@ -419,6 +423,7 @@ public abstract class AbstractCmisObject return getSession().createObjectId(newObjectId); } + @Override public CmisObject rename(String newName) { if (newName == null || newName.length() == 0) { throw new IllegalArgumentException("New name must not be empty!"); @@ -430,6 +435,7 @@ public abstract class AbstractCmisObject return updateProperties(prop); } + @Override public ObjectId rename(String newName, boolean refresh) { if (newName == null || newName.length() == 0) { throw new IllegalArgumentException("New name must not be empty!"); @@ -443,6 +449,7 @@ public abstract class AbstractCmisObject // --- properties --- + @Override public ObjectType getBaseType() { BaseTypeId baseTypeId = getBaseTypeId(); if (baseTypeId == null) { @@ -452,6 +459,7 @@ public abstract class AbstractCmisObject return getSession().getTypeDefinition(baseTypeId.value()); } + @Override public BaseTypeId getBaseTypeId() { String baseType = getPropertyValue(PropertyIds.BASE_TYPE_ID); if (baseType == null) { @@ -461,38 +469,47 @@ public abstract class AbstractCmisObject return BaseTypeId.fromValue(baseType); } + @Override public String getChangeToken() { return getPropertyValue(PropertyIds.CHANGE_TOKEN); } + @Override public String getCreatedBy() { return getPropertyValue(PropertyIds.CREATED_BY); } + @Override public GregorianCalendar getCreationDate() { return getPropertyValue(PropertyIds.CREATION_DATE); } + @Override public String getId() { return getPropertyValue(PropertyIds.OBJECT_ID); } + @Override public GregorianCalendar getLastModificationDate() { return getPropertyValue(PropertyIds.LAST_MODIFICATION_DATE); } + @Override public String getLastModifiedBy() { return getPropertyValue(PropertyIds.LAST_MODIFIED_BY); } + @Override public String getName() { return getPropertyValue(PropertyIds.NAME); } + @Override public String getDescription() { return getPropertyValue(PropertyIds.DESCRIPTION); } + @Override public List<Property<?>> getProperties() { readLock(); try { @@ -502,6 +519,7 @@ public abstract class AbstractCmisObject } } + @Override @SuppressWarnings("unchecked") public <T> Property<T> getProperty(String id) { readLock(); @@ -512,6 +530,7 @@ public abstract class AbstractCmisObject } } + @Override @SuppressWarnings("unchecked") public <T> T getPropertyValue(String id) { Property<T> property = getProperty(id); @@ -522,6 +541,7 @@ public abstract class AbstractCmisObject return (T) property.getValue(); } + @Override public ObjectType getType() { readLock(); try { @@ -531,6 +551,7 @@ public abstract class AbstractCmisObject } } + @Override public List<SecondaryType> getSecondaryTypes() { readLock(); try { @@ -540,6 +561,7 @@ public abstract class AbstractCmisObject } } + @Override public List<ObjectType> findObjectType(String id) { List<ObjectType> result = null; @@ -570,6 +592,7 @@ public abstract class AbstractCmisObject // --- allowable actions --- + @Override public AllowableActions getAllowableActions() { readLock(); try { @@ -579,6 +602,7 @@ public abstract class AbstractCmisObject } } + @Override public boolean hasAllowableAction(Action action) { if (action == null) { throw new IllegalArgumentException("Action must be set!"); @@ -594,6 +618,7 @@ public abstract class AbstractCmisObject // --- renditions --- + @Override public List<Rendition> getRenditions() { readLock(); try { @@ -610,6 +635,7 @@ public abstract class AbstractCmisObject return getBinding().getAclService().getAcl(getRepositoryId(), objectId, onlyBasicPermissions, null); } + @Override public Acl applyAcl(List<Ace> addAces, List<Ace> removeAces, AclPropagation aclPropagation) { Acl result = getSession().applyAcl(this, addAces, removeAces, aclPropagation); @@ -618,14 +644,17 @@ public abstract class AbstractCmisObject return result; } + @Override public Acl addAcl(List<Ace> addAces, AclPropagation aclPropagation) { return applyAcl(addAces, null, aclPropagation); } + @Override public Acl removeAcl(List<Ace> removeAces, AclPropagation aclPropagation) { return applyAcl(null, removeAces, aclPropagation); } + @Override public Acl setAcl(List<Ace> aces) { Acl result = getSession().setAcl(this, aces); @@ -634,6 +663,7 @@ public abstract class AbstractCmisObject return result; } + @Override public Acl getAcl() { readLock(); try { @@ -643,6 +673,7 @@ public abstract class AbstractCmisObject } } + @Override public Set<String> getPermissionsForPrincipal(String principalId) { if (principalId == null) { throw new IllegalArgumentException("Principal must be set!"); @@ -669,12 +700,14 @@ public abstract class AbstractCmisObject return result; } + @Override public Set<String> getPermissonsForPrincipal(String principalId) { return getPermissionsForPrincipal(principalId); } // --- policies --- + @Override public void applyPolicy(ObjectId... policyIds) { readLock(); try { @@ -686,6 +719,7 @@ public abstract class AbstractCmisObject refresh(); } + @Override public void applyPolicy(ObjectId policyId, boolean refresh) { readLock(); try { @@ -699,6 +733,7 @@ public abstract class AbstractCmisObject } } + @Override public void removePolicy(ObjectId... policyIds) { readLock(); try { @@ -710,6 +745,7 @@ public abstract class AbstractCmisObject refresh(); } + @Override public void removePolicy(ObjectId policyId, boolean refresh) { readLock(); try { @@ -723,6 +759,7 @@ public abstract class AbstractCmisObject } } + @Override public List<Policy> getPolicies() { readLock(); try { @@ -734,6 +771,7 @@ public abstract class AbstractCmisObject // --- relationships --- + @Override public List<Relationship> getRelationships() { readLock(); try { @@ -745,6 +783,7 @@ public abstract class AbstractCmisObject // --- extensions --- + @Override public List<CmisExtensionElement> getExtensions(ExtensionLevel level) { List<CmisExtensionElement> ext = extensions.get(level); if (ext == null) { @@ -756,12 +795,14 @@ public abstract class AbstractCmisObject // --- adapters --- + @Override public <T> T getAdapter(Class<T> adapterInterface) { return null; } // --- other --- + @Override public long getRefreshTimestamp() { readLock(); try { @@ -771,6 +812,7 @@ public abstract class AbstractCmisObject } } + @Override public void refresh() { writeLock(); try { @@ -793,6 +835,7 @@ public abstract class AbstractCmisObject } } + @Override public void refreshIfOld(long durationInMillis) { writeLock(); try { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractFilableCmisObject.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractFilableCmisObject.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractFilableCmisObject.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractFilableCmisObject.java Thu Aug 13 12:05:59 2015 @@ -45,10 +45,12 @@ public abstract class AbstractFilableCmi private static final long serialVersionUID = 1L; + @Override public List<Folder> getParents() { return getParents(getSession().getDefaultContext()); } + @Override public List<Folder> getParents(OperationContext context) { String objectId = getObjectId(); @@ -85,12 +87,13 @@ public abstract class AbstractFilableCmi return parents; } + @Override public List<String> getPaths() { String objectId = getObjectId(); ObjectType folderType = getSession().getTypeDefinition(BaseTypeId.CMIS_FOLDER.value()); PropertyDefinition<?> propDef = folderType.getPropertyDefinitions().get(PropertyIds.PATH); - String pathQueryName = (propDef == null ? null : propDef.getQueryName()); + String pathQueryName = propDef == null ? null : propDef.getQueryName(); // get object paths of the parent folders List<ObjectParentData> bindingParents = getBinding().getNavigationService().getObjectParents(getRepositoryId(), @@ -127,10 +130,12 @@ public abstract class AbstractFilableCmi return paths; } + @Override public FileableCmisObject move(ObjectId sourceFolderId, ObjectId targetFolderId) { return move(sourceFolderId, targetFolderId, getSession().getDefaultContext()); } + @Override public FileableCmisObject move(ObjectId sourceFolderId, ObjectId targetFolderId, OperationContext context) { String objectId = getObjectId(); Holder<String> objectIdHolder = new Holder<String>(objectId); @@ -161,6 +166,7 @@ public abstract class AbstractFilableCmi return (FileableCmisObject) movedObject; } + @Override public void addToFolder(ObjectId folderId, boolean allVersions) { String objectId = getObjectId(); @@ -175,6 +181,7 @@ public abstract class AbstractFilableCmi getSession().removeObjectFromCache(objectId); } + @Override public void removeFromFolder(ObjectId folderId) { String objectId = getObjectId(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventImpl.java Thu Aug 13 12:05:59 2015 @@ -52,6 +52,7 @@ public class ChangeEventImpl extends Cha this.acl = acl; } + @Override public String getObjectId() { return objectId; } @@ -60,6 +61,7 @@ public class ChangeEventImpl extends Cha this.objectId = objectId; } + @Override public Map<String, List<?>> getProperties() { return properties; } @@ -68,6 +70,7 @@ public class ChangeEventImpl extends Cha this.properties = properties; } + @Override public List<String> getPolicyIds() { return policyIds; } @@ -76,6 +79,7 @@ public class ChangeEventImpl extends Cha this.policyIds = policyIds; } + @Override public Acl getAcl() { return acl; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventsImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventsImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventsImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ChangeEventsImpl.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public class ChangeEventsImpl implements this.totalNumItems = totalNumItems; } + @Override public String getLatestChangeLogToken() { return latestChangeLogToken; } @@ -50,6 +51,7 @@ public class ChangeEventsImpl implements this.latestChangeLogToken = latestChangeLogToken; } + @Override public List<ChangeEvent> getChangeEvents() { if (events == null) { events = new ArrayList<ChangeEvent>(); @@ -62,6 +64,7 @@ public class ChangeEventsImpl implements this.events = events; } + @Override public boolean getHasMoreItems() { return hasMoreItems; } @@ -74,6 +77,7 @@ public class ChangeEventsImpl implements this.totalNumItems = totalNumItems; } + @Override public long getTotalNumItems() { return totalNumItems; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/DocumentImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/DocumentImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/DocumentImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/DocumentImpl.java Thu Aug 13 12:05:59 2015 @@ -67,67 +67,83 @@ public class DocumentImpl extends Abstra // properties + @Override public String getCheckinComment() { return getPropertyValue(PropertyIds.CHECKIN_COMMENT); } + @Override public String getVersionLabel() { return getPropertyValue(PropertyIds.VERSION_LABEL); } + @Override public String getVersionSeriesId() { return getPropertyValue(PropertyIds.VERSION_SERIES_ID); } + @Override public String getVersionSeriesCheckedOutId() { return getPropertyValue(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID); } + @Override public String getVersionSeriesCheckedOutBy() { return getPropertyValue(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY); } + @Override public Boolean isImmutable() { return getPropertyValue(PropertyIds.IS_IMMUTABLE); } + @Override public Boolean isLatestMajorVersion() { return getPropertyValue(PropertyIds.IS_LATEST_MAJOR_VERSION); } + @Override public Boolean isLatestVersion() { return getPropertyValue(PropertyIds.IS_LATEST_VERSION); } + @Override public Boolean isMajorVersion() { return getPropertyValue(PropertyIds.IS_MAJOR_VERSION); } + @Override public Boolean isPrivateWorkingCopy() { return getPropertyValue(PropertyIds.IS_PRIVATE_WORKING_COPY); } + @Override public Boolean isVersionSeriesCheckedOut() { return getPropertyValue(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT); } + @Override public long getContentStreamLength() { BigInteger bigInt = getPropertyValue(PropertyIds.CONTENT_STREAM_LENGTH); - return (bigInt == null) ? (long) -1 : bigInt.longValue(); + return bigInt == null ? (long) -1 : bigInt.longValue(); } + @Override public String getContentStreamMimeType() { return getPropertyValue(PropertyIds.CONTENT_STREAM_MIME_TYPE); } + @Override public String getContentStreamFileName() { return getPropertyValue(PropertyIds.CONTENT_STREAM_FILE_NAME); } + @Override public String getContentStreamId() { return getPropertyValue(PropertyIds.CONTENT_STREAM_ID); } + @Override public List<ContentStreamHash> getContentStreamHashes() { List<String> hashes = getPropertyValue(PropertyIds.CONTENT_STREAM_HASH); if (isNullOrEmpty(hashes)) { @@ -144,6 +160,7 @@ public class DocumentImpl extends Abstra // operations + @Override public Document copy(ObjectId targetFolderId, Map<String, ?> properties, VersioningState versioningState, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -168,6 +185,7 @@ public class DocumentImpl extends Abstra return (Document) object; } + @Override public Document copy(ObjectId targetFolderId) { return copy(targetFolderId, null, null, null, null, null, getSession().getDefaultContext()); } @@ -220,12 +238,14 @@ public class DocumentImpl extends Abstra } } + @Override public void deleteAllVersions() { delete(true); } // versioning + @Override public ObjectId checkOut() { String newObjectId = null; @@ -251,6 +271,7 @@ public class DocumentImpl extends Abstra return getSession().createObjectId(newObjectId); } + @Override public void cancelCheckOut() { String objectId = getObjectId(); @@ -260,6 +281,7 @@ public class DocumentImpl extends Abstra getSession().removeObjectFromCache(this); } + @Override public ObjectId checkIn(boolean major, Map<String, ?> properties, ContentStream contentStream, String checkinComment, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces) { String newObjectId = null; @@ -294,10 +316,12 @@ public class DocumentImpl extends Abstra return getSession().createObjectId(newObjectId); } + @Override public List<Document> getAllVersions() { return getAllVersions(getSession().getDefaultContext()); } + @Override public List<Document> getAllVersions(OperationContext context) { String objectId; String versionSeriesId; @@ -332,28 +356,34 @@ public class DocumentImpl extends Abstra } + @Override public Document getObjectOfLatestVersion(boolean major) { return getObjectOfLatestVersion(major, getSession().getDefaultContext()); } + @Override public Document getObjectOfLatestVersion(boolean major, OperationContext context) { return getSession().getLatestDocumentVersion(this, major, context); } // content operations + @Override public ContentStream getContentStream() { return getContentStream(null, null, null); } + @Override public ContentStream getContentStream(BigInteger offset, BigInteger length) { return getContentStream(null, offset, length); } + @Override public ContentStream getContentStream(String streamId) { return getContentStream(streamId, null, null); } + @Override public ContentStream getContentStream(String streamId, BigInteger offset, BigInteger length) { // get the stream ContentStream contentStream = getSession().getContentStream(this, streamId, offset, length); @@ -376,10 +406,12 @@ public class DocumentImpl extends Abstra contentStream.getStream(), contentStream instanceof PartialContentStream); } + @Override public String getContentUrl() { return getContentUrl(null); } + @Override public String getContentUrl(String streamId) { if (getBinding().getObjectService() instanceof LinkAccess) { LinkAccess linkAccess = (LinkAccess) getBinding().getObjectService(); @@ -394,6 +426,7 @@ public class DocumentImpl extends Abstra return null; } + @Override public Document setContentStream(ContentStream contentStream, boolean overwrite) { ObjectId objectId = setContentStream(contentStream, overwrite, true); if (objectId == null) { @@ -407,6 +440,7 @@ public class DocumentImpl extends Abstra return this; } + @Override public ObjectId setContentStream(ContentStream contentStream, boolean overwrite, boolean refresh) { String newObjectId = null; @@ -434,6 +468,7 @@ public class DocumentImpl extends Abstra return getSession().createObjectId(newObjectId); } + @Override public Document appendContentStream(ContentStream contentStream, boolean isLastChunk) { if (getSession().getRepositoryInfo().getCmisVersion() == CmisVersion.CMIS_1_0) { throw new CmisNotSupportedException("This method is not supported for CMIS 1.0 repositories."); @@ -451,6 +486,7 @@ public class DocumentImpl extends Abstra return this; } + @Override public ObjectId appendContentStream(ContentStream contentStream, boolean isLastChunk, boolean refresh) { String newObjectId = null; @@ -478,6 +514,7 @@ public class DocumentImpl extends Abstra return getSession().createObjectId(newObjectId); } + @Override public Document deleteContentStream() { ObjectId objectId = deleteContentStream(true); if (objectId == null) { @@ -491,6 +528,7 @@ public class DocumentImpl extends Abstra return this; } + @Override public ObjectId deleteContentStream(boolean refresh) { String newObjectId = null; @@ -518,6 +556,7 @@ public class DocumentImpl extends Abstra return getSession().createObjectId(newObjectId); } + @Override public ObjectId checkIn(boolean major, Map<String, ?> properties, ContentStream contentStream, String checkinComment) { return this.checkIn(major, properties, contentStream, checkinComment, null, null, null); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/FolderImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/FolderImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/FolderImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/FolderImpl.java Thu Aug 13 12:05:59 2015 @@ -69,6 +69,7 @@ public class FolderImpl extends Abstract initialize(session, objectType, objectData, context); } + @Override public Document createDocument(Map<String, ?> properties, ContentStream contentStream, VersioningState versioningState, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -90,6 +91,7 @@ public class FolderImpl extends Abstract return (Document) object; } + @Override public Document createDocumentFromSource(ObjectId source, Map<String, ?> properties, VersioningState versioningState, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -111,6 +113,7 @@ public class FolderImpl extends Abstract return (Document) object; } + @Override public Folder createFolder(Map<String, ?> properties, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -130,6 +133,7 @@ public class FolderImpl extends Abstract return (Folder) object; } + @Override public Policy createPolicy(Map<String, ?> properties, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -149,6 +153,7 @@ public class FolderImpl extends Abstract return (Policy) object; } + @Override public Item createItem(Map<String, ?> properties, List<Policy> policies, List<Ace> addAces, List<Ace> removeAces, OperationContext context) { @@ -168,14 +173,17 @@ public class FolderImpl extends Abstract return (Item) object; } + @Override public List<String> deleteTree(boolean allVersions, UnfileObject unfile, boolean continueOnFailure) { return getSession().deleteTree(this, allVersions, unfile, continueOnFailure); } + @Override public String getParentId() { return getPropertyValue(PropertyIds.PARENT_ID); } + @Override public List<ObjectType> getAllowedChildObjectTypes() { List<ObjectType> result = new ArrayList<ObjectType>(); @@ -196,10 +204,12 @@ public class FolderImpl extends Abstract return result; } + @Override public ItemIterable<Document> getCheckedOutDocs() { return getCheckedOutDocs(getSession().getDefaultContext()); } + @Override public ItemIterable<Document> getCheckedOutDocs(OperationContext context) { final String objectId = getObjectId(); final NavigationService navigationService = getBinding().getNavigationService(); @@ -237,10 +247,12 @@ public class FolderImpl extends Abstract }); } + @Override public ItemIterable<CmisObject> getChildren() { return getChildren(getSession().getDefaultContext()); } + @Override public ItemIterable<CmisObject> getChildren(OperationContext context) { final String objectId = getObjectId(); final NavigationService navigationService = getBinding().getNavigationService(); @@ -274,10 +286,12 @@ public class FolderImpl extends Abstract }); } + @Override public List<Tree<FileableCmisObject>> getDescendants(int depth) { return getDescendants(depth, getSession().getDefaultContext()); } + @Override public List<Tree<FileableCmisObject>> getDescendants(int depth, OperationContext context) { String objectId = getObjectId(); @@ -290,10 +304,12 @@ public class FolderImpl extends Abstract return convertBindingContainer(providerContainerList, context); } + @Override public List<Tree<FileableCmisObject>> getFolderTree(int depth) { return getFolderTree(depth, getSession().getDefaultContext()); } + @Override public List<Tree<FileableCmisObject>> getFolderTree(int depth, OperationContext context) { String objectId = getObjectId(); @@ -342,6 +358,7 @@ public class FolderImpl extends Abstract return result; } + @Override public boolean isRootFolder() { String objectId = getObjectId(); String rootFolderId = getSession().getRepositoryInfo().getRootFolderId(); @@ -349,6 +366,7 @@ public class FolderImpl extends Abstract return objectId.equals(rootFolderId); } + @Override public Folder getFolderParent() { if (isRootFolder()) { return null; @@ -362,6 +380,7 @@ public class FolderImpl extends Abstract return parents.get(0); } + @Override public String getPath() { String path; @@ -435,25 +454,30 @@ public class FolderImpl extends Abstract return Collections.singletonList(getPath()); } + @Override public Document createDocument(Map<String, ?> properties, ContentStream contentStream, VersioningState versioningState) { return this.createDocument(properties, contentStream, versioningState, null, null, null, getSession() .getDefaultContext()); } + @Override public Document createDocumentFromSource(ObjectId source, Map<String, ?> properties, VersioningState versioningState) { return this.createDocumentFromSource(source, properties, versioningState, null, null, null, getSession() .getDefaultContext()); } + @Override public Folder createFolder(Map<String, ?> properties) { return this.createFolder(properties, null, null, null, getSession().getDefaultContext()); } + @Override public Policy createPolicy(Map<String, ?> properties) { return this.createPolicy(properties, null, null, null, getSession().getDefaultContext()); } + @Override public Item createItem(Map<String, ?> properties) { return this.createItem(properties, null, null, null, getSession().getDefaultContext()); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ObjectIdImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ObjectIdImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ObjectIdImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ObjectIdImpl.java Thu Aug 13 12:05:59 2015 @@ -42,6 +42,7 @@ public class ObjectIdImpl implements Obj this.id = id; } + @Override public String getId() { return id; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java Thu Aug 13 12:05:59 2015 @@ -109,6 +109,7 @@ public class OperationContextImpl implem setMaxItemsPerPage(maxItemsPerPage); } + @Override public final Set<String> getFilter() { if (filter == null) { return null; @@ -117,6 +118,7 @@ public class OperationContextImpl implem return Collections.unmodifiableSet(filter); } + @Override public final void setFilter(Set<String> propertyFilter) { if (propertyFilter != null) { TreeSet<String> tempSet = new TreeSet<String>(); @@ -154,6 +156,7 @@ public class OperationContextImpl implem generateCacheKey(); } + @Override public final void setFilterString(String propertyFilter) { if ((propertyFilter == null) || (propertyFilter.trim().length() == 0)) { setFilter(null); @@ -169,6 +172,7 @@ public class OperationContextImpl implem setFilter(tempSet); } + @Override public final String getFilterString() { if (filter == null) { return null; @@ -198,50 +202,61 @@ public class OperationContextImpl implem return sb.toString(); } + @Override public final void setLoadSecondaryTypeProperties(boolean load) { loadSecondaryTypeProperties = load; } + @Override public final boolean loadSecondaryTypeProperties() { return loadSecondaryTypeProperties; } + @Override public final boolean isIncludeAcls() { return includeAcls; } + @Override public final void setIncludeAcls(boolean include) { includeAcls = include; generateCacheKey(); } + @Override public final boolean isIncludeAllowableActions() { return includeAllowableActions; } + @Override public final void setIncludeAllowableActions(boolean include) { includeAllowableActions = include; generateCacheKey(); } + @Override public final boolean isIncludePolicies() { return includePolicies; } + @Override public final void setIncludePolicies(boolean include) { includePolicies = include; generateCacheKey(); } + @Override public final IncludeRelationships getIncludeRelationships() { return includeRelationships; } + @Override public final void setIncludeRelationships(IncludeRelationships include) { includeRelationships = include; generateCacheKey(); } + @Override public final Set<String> getRenditionFilter() { if (renditionFilter == null) { return null; @@ -250,6 +265,7 @@ public class OperationContextImpl implem return Collections.unmodifiableSet(renditionFilter); } + @Override public final void setRenditionFilter(Set<String> renditionFilter) { TreeSet<String> tempSet = new TreeSet<String>(); @@ -281,6 +297,7 @@ public class OperationContextImpl implem generateCacheKey(); } + @Override public final void setRenditionFilterString(String renditionFilter) { if (renditionFilter == null || renditionFilter.trim().length() == 0) { setRenditionFilter(null); @@ -296,6 +313,7 @@ public class OperationContextImpl implem setRenditionFilter(tempSet); } + @Override public final String getRenditionFilterString() { if (renditionFilter == null) { return null; @@ -314,30 +332,37 @@ public class OperationContextImpl implem return sb.toString(); } + @Override public final boolean isIncludePathSegments() { return includePathSegments; } + @Override public final void setIncludePathSegments(boolean include) { includePathSegments = include; } + @Override public final String getOrderBy() { return orderBy; } + @Override public final void setOrderBy(String orderBy) { this.orderBy = orderBy; } + @Override public final boolean isCacheEnabled() { return cacheEnabled; } + @Override public final void setCacheEnabled(boolean cacheEnabled) { this.cacheEnabled = cacheEnabled; } + @Override public final String getCacheKey() { return cacheKey; } @@ -367,10 +392,12 @@ public class OperationContextImpl implem cacheKey = sb.toString(); } + @Override public final int getMaxItemsPerPage() { return maxItemsPerPage; } + @Override public final void setMaxItemsPerPage(int maxItemsPerPage) { if (maxItemsPerPage < 1) { throw new IllegalArgumentException("itemsPerPage must be > 0!"); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PolicyImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PolicyImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PolicyImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PolicyImpl.java Thu Aug 13 12:05:59 2015 @@ -35,6 +35,7 @@ public class PolicyImpl extends Abstract initialize(session, objectType, objectData, context); } + @Override public String getPolicyText() { return getPropertyValue(PropertyIds.POLICY_TEXT); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PropertyImpl.java Thu Aug 13 12:05:59 2015 @@ -37,13 +37,6 @@ public class PropertyImpl<T> extends Abs private static final long serialVersionUID = 1L; private final PropertyDefinition<T> propertyDefinition; - protected void initialize(PropertyDefinition<?> pd) { - setId(pd.getId()); - setDisplayName(pd.getDisplayName()); - setLocalName(pd.getLocalName()); - setQueryName(pd.getQueryName()); - } - /** * Constructs a property from a list of values. */ @@ -72,14 +65,24 @@ public class PropertyImpl<T> extends Abs setValues(new ArrayList<T>(property.getValues())); } + protected void initialize(PropertyDefinition<?> pd) { + setId(pd.getId()); + setDisplayName(pd.getDisplayName()); + setLocalName(pd.getLocalName()); + setQueryName(pd.getQueryName()); + } + + @Override public PropertyDefinition<T> getDefinition() { return propertyDefinition; } + @Override public PropertyType getType() { return propertyDefinition.getPropertyType(); } + @Override @SuppressWarnings("unchecked") public <U> U getValue() { List<T> values = getValues(); @@ -90,6 +93,7 @@ public class PropertyImpl<T> extends Abs } } + @Override public String getValueAsString() { List<T> values = getValues(); if (values.isEmpty()) { @@ -99,6 +103,7 @@ public class PropertyImpl<T> extends Abs return formatValue(values.get(0)); } + @Override public String getValuesAsString() { List<T> values = getValues(); @@ -130,6 +135,7 @@ public class PropertyImpl<T> extends Abs return result; } + @Override public boolean isMultiValued() { return propertyDefinition.getCardinality() == Cardinality.MULTI; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java Thu Aug 13 12:05:59 2015 @@ -95,20 +95,24 @@ public class QueryResultImpl implements } } + @Override public List<PropertyData<?>> getProperties() { return new ArrayList<PropertyData<?>>(propertiesByQueryName.values()); } + @Override @SuppressWarnings("unchecked") public <T> PropertyData<T> getPropertyById(String id) { return (PropertyData<T>) propertiesById.get(id); } + @Override @SuppressWarnings("unchecked") public <T> PropertyData<T> getPropertyByQueryName(String queryName) { return (PropertyData<T>) propertiesByQueryName.get(queryName); } + @Override public <T> T getPropertyValueById(String id) { PropertyData<T> property = getPropertyById(id); if (property == null) { @@ -118,6 +122,7 @@ public class QueryResultImpl implements return property.getFirstValue(); } + @Override public <T> T getPropertyValueByQueryName(String queryName) { PropertyData<T> property = getPropertyByQueryName(queryName); if (property == null) { @@ -127,6 +132,7 @@ public class QueryResultImpl implements return property.getFirstValue(); } + @Override public <T> List<T> getPropertyMultivalueById(String id) { PropertyData<T> property = getPropertyById(id); if (property == null) { @@ -136,6 +142,7 @@ public class QueryResultImpl implements return property.getValues(); } + @Override public <T> List<T> getPropertyMultivalueByQueryName(String queryName) { PropertyData<T> property = getPropertyByQueryName(queryName); if (property == null) { @@ -145,14 +152,17 @@ public class QueryResultImpl implements return property.getValues(); } + @Override public AllowableActions getAllowableActions() { return allowableActions; } + @Override public List<Relationship> getRelationships() { return relationships; } + @Override public List<Rendition> getRenditions() { return renditions; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryStatementImpl.java Thu Aug 13 12:05:59 2015 @@ -287,10 +287,12 @@ public class QueryStatementImpl implemen this.statement = stmt.toString(); } + @Override public void setType(int parameterIndex, String typeId) { setType(parameterIndex, session.getTypeDefinition(typeId)); } + @Override public void setType(int parameterIndex, ObjectType type) { if (type == null) { throw new IllegalArgumentException("Type must be set!"); @@ -304,6 +306,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, queryName); } + @Override public void setProperty(int parameterIndex, String typeId, String propertyId) { ObjectType type = session.getTypeDefinition(typeId); @@ -315,6 +318,7 @@ public class QueryStatementImpl implemen setProperty(parameterIndex, propertyDefinition); } + @Override public void setProperty(int parameterIndex, PropertyDefinition<?> propertyDefinition) { if (propertyDefinition == null) { throw new IllegalArgumentException("Property must be set!"); @@ -328,6 +332,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, queryName); } + @Override public void setNumber(int parameterIndex, Number... num) { if (num == null || num.length == 0) { throw new IllegalArgumentException("Number must be set!"); @@ -345,6 +350,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setString(int parameterIndex, String... str) { if (str == null || str.length == 0) { throw new IllegalArgumentException("String must be set!"); @@ -362,6 +368,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setStringContains(int parameterIndex, String str) { if (str == null) { throw new IllegalArgumentException("String must be set!"); @@ -370,6 +377,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, escapeContains(str)); } + @Override public void setStringLike(int parameterIndex, String str) { if (str == null) { throw new IllegalArgumentException("String must be set!"); @@ -378,6 +386,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, escapeLike(str)); } + @Override public void setId(int parameterIndex, ObjectId... id) { if (id == null || id.length == 0) { throw new IllegalArgumentException("Id must be set!"); @@ -395,6 +404,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setUri(int parameterIndex, URI... uri) { if (uri == null) { throw new IllegalArgumentException("URI must be set!"); @@ -412,6 +422,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setUrl(int parameterIndex, URL... url) { if (url == null) { throw new IllegalArgumentException("URL must be set!"); @@ -429,6 +440,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setBoolean(int parameterIndex, boolean... bool) { if (bool == null || bool.length == 0) { throw new IllegalArgumentException("Boolean must not be set!"); @@ -442,10 +454,12 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setDateTime(int parameterIndex, Calendar... cal) { setDateTime(parameterIndex, false, cal); } + @Override public void setDateTimeTimestamp(int parameterIndex, Calendar... cal) { setDateTime(parameterIndex, true, cal); } @@ -475,10 +489,12 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, sb.toString()); } + @Override public void setDateTime(int parameterIndex, Date... date) { setDateTime(parameterIndex, false, date); } + @Override public void setDateTimeTimestamp(int parameterIndex, Date... date) { setDateTime(parameterIndex, true, date); } @@ -500,10 +516,12 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public void setDateTime(int parameterIndex, long... ms) { setDateTime(parameterIndex, false, ms); } + @Override public void setDateTimeTimestamp(int parameterIndex, long... ms) { setDateTime(parameterIndex, true, ms); } @@ -521,6 +539,7 @@ public class QueryStatementImpl implemen parametersMap.put(parameterIndex, slb.toString()); } + @Override public String toQueryString() { boolean inStr = false; int parameterIndex = 0; @@ -552,10 +571,12 @@ public class QueryStatementImpl implemen return sb.toString(); } + @Override public ItemIterable<QueryResult> query(boolean searchAllVersions) { return session.query(toQueryString(), searchAllVersions); } + @Override public ItemIterable<QueryResult> query(boolean searchAllVersions, OperationContext context) { return session.query(toQueryString(), searchAllVersions, context); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RelationshipImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RelationshipImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RelationshipImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RelationshipImpl.java Thu Aug 13 12:05:59 2015 @@ -37,10 +37,12 @@ public class RelationshipImpl extends Ab initialize(session, objectType, objectData, context); } + @Override public CmisObject getSource() { return getSource(getSession().getDefaultContext()); } + @Override public CmisObject getSource(OperationContext context) { readLock(); try { @@ -55,6 +57,7 @@ public class RelationshipImpl extends Ab } } + @Override public ObjectId getSourceId() { String sourceId = getPropertyValue(PropertyIds.SOURCE_ID); if ((sourceId == null) || (sourceId.length() == 0)) { @@ -64,10 +67,12 @@ public class RelationshipImpl extends Ab return getSession().createObjectId(sourceId); } + @Override public CmisObject getTarget() { return getTarget(getSession().getDefaultContext()); } + @Override public CmisObject getTarget(OperationContext context) { readLock(); try { @@ -82,6 +87,7 @@ public class RelationshipImpl extends Ab } } + @Override public ObjectId getTargetId() { String targetId = getPropertyValue(PropertyIds.TARGET_ID); if ((targetId == null) || (targetId.length() == 0)) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java Thu Aug 13 12:05:59 2015 @@ -51,22 +51,27 @@ public class RenditionImpl extends Rendi this.objectId = objectId; } + @Override public long getLength() { return getBigLength() == null ? -1 : getBigLength().longValue(); } + @Override public long getHeight() { return getBigHeight() == null ? -1 : getBigHeight().longValue(); } + @Override public long getWidth() { return getBigWidth() == null ? -1 : getBigWidth().longValue(); } + @Override public Document getRenditionDocument() { return getRenditionDocument(session.getDefaultContext()); } + @Override public Document getRenditionDocument(OperationContext context) { if (getRenditionDocumentId() == null) { return null; @@ -79,6 +84,7 @@ public class RenditionImpl extends Rendi return (Document) rendDoc; } + @Override public ContentStream getContentStream() { if (objectId == null || getStreamId() == null) { return null; @@ -111,6 +117,7 @@ public class RenditionImpl extends Rendi contentStream.getStream()); } + @Override public String getContentUrl() { if (session.getBinding().getObjectService() instanceof LinkAccess) { LinkAccess linkAccess = (LinkAccess) session.getBinding().getObjectService(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java Thu Aug 13 12:05:59 2015 @@ -188,9 +188,9 @@ public class SessionImpl implements Sess this.parameters = parameters; this.locale = determineLocale(parameters); - this.objectFactory = (objectFactory == null ? createObjectFactory() : objectFactory); + this.objectFactory = objectFactory == null ? createObjectFactory() : objectFactory; this.authenticationProvider = authenticationProvider; - this.cache = (cache == null ? createCache() : cache); + this.cache = cache == null ? createCache() : cache; this.typeDefCache = typeDefCache; cachePathOmit = Boolean.parseBoolean(parameters.get(SessionParameter.CACHE_PATH_OMIT)); @@ -443,6 +443,7 @@ public class SessionImpl implements Sess }; } + @Override public String getLatestChangeLogToken() { return getBinding().getRepositoryService().getRepositoryInfo(getRepositoryId(), null).getLatestChangeLogToken(); } @@ -461,7 +462,7 @@ public class SessionImpl implements Sess public void setDefaultContext(OperationContext context) { lock.writeLock().lock(); try { - this.defaultContext = (context == null ? DEFAULT_CONTEXT : context); + this.defaultContext = context == null ? DEFAULT_CONTEXT : context; } finally { lock.writeLock().unlock(); } @@ -487,6 +488,7 @@ public class SessionImpl implements Sess return new ObjectIdImpl(id); } + @Override public Locale getLocale() { return locale; } @@ -1080,6 +1082,7 @@ public class SessionImpl implements Sess } } + @Override public CmisBinding getBinding() { lock.readLock().lock(); try { @@ -1270,7 +1273,7 @@ public class SessionImpl implements Sess checkContext(context); final String id = objectId.getId(); - final String typeId = (type == null ? null : type.getId()); + final String typeId = type == null ? null : type.getId(); final RelationshipService relationshipService = getBinding().getRelationshipService(); final OperationContext ctxt = new OperationContextImpl(context); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/async/AbstractExecutorServiceAsyncSession.java URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/async/AbstractExecutorServiceAsyncSession.java?rev=1695691&r1=1695690&r2=1695691&view=diff ============================================================================== --- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/async/AbstractExecutorServiceAsyncSession.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/async/AbstractExecutorServiceAsyncSession.java Thu Aug 13 12:05:59 2015 @@ -63,7 +63,7 @@ public abstract class AbstractExecutorSe /** * A {@link Callable} that has a {@link Session} object. */ - public static abstract class SessionCallable<V> implements Callable<V> { + public abstract static class SessionCallable<V> implements Callable<V> { protected Session session;
