Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.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/impl/SessionImpl.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/impl/SessionImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java Thu Aug 13 12:05:59 2015 @@ -78,7 +78,7 @@ public class SessionImpl implements Bind @Override public Object get(String key, Object defValue) { Object value = get(key); - return (value == null ? defValue : value); + return value == null ? defValue : value; } @Override @@ -126,7 +126,7 @@ public class SessionImpl implements Bind @Override public void put(String key, Object obj, boolean isTransient) { - Object value = (isTransient ? new TransientWrapper(obj) : obj); + Object value = isTransient ? new TransientWrapper(obj) : obj; if (!(value instanceof Serializable)) { throw new IllegalArgumentException("Object must be serializable!"); } @@ -139,6 +139,7 @@ public class SessionImpl implements Bind } } + @Override public void remove(String key) { lock.writeLock().lock(); try { @@ -148,18 +149,22 @@ public class SessionImpl implements Bind } } + @Override public void readLock() { lock.readLock().lock(); } + @Override public void readUnlock() { lock.readLock().unlock(); } + @Override public void writeLock() { lock.writeLock().lock(); } + @Override public void writeUnlock() { lock.writeLock().unlock(); }
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/TransientWrapper.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/impl/TransientWrapper.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/impl/TransientWrapper.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/TransientWrapper.java Thu Aug 13 12:05:59 2015 @@ -41,7 +41,7 @@ public class TransientWrapper implements @Override public String toString() { - return (object == null ? "(no object)" : "(transient) " + object.toString()); + return object == null ? "(no object)" : "(transient) " + object.toString(); } private void writeObject(ObjectOutputStream out) throws IOException { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/TypeDefinitionCacheImpl.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/impl/TypeDefinitionCacheImpl.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/impl/TypeDefinitionCacheImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/TypeDefinitionCacheImpl.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class TypeDefinitionCacheImpl imp } + @Override public void initialize(BindingSession session) { assert session != null; @@ -65,6 +66,7 @@ public class TypeDefinitionCacheImpl imp }); } + @Override public void put(String repositoryId, TypeDefinition typeDefinition) { if ((typeDefinition == null) || (typeDefinition.getId() == null)) { return; @@ -73,18 +75,22 @@ public class TypeDefinitionCacheImpl imp cache.put(typeDefinition, repositoryId, typeDefinition.getId()); } + @Override public TypeDefinition get(String repositoryId, String typeId) { return (TypeDefinition) cache.get(repositoryId, typeId); } + @Override public void remove(String repositoryId, String typeId) { cache.remove(repositoryId, typeId); } + @Override public void remove(String repositoryId) { cache.remove(repositoryId); } + @Override public void removeAll() { cache.removeAll(); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.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/AbstractAuthenticationProvider.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/AbstractAuthenticationProvider.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/AbstractAuthenticationProvider.java Thu Aug 13 12:05:59 2015 @@ -40,6 +40,7 @@ public abstract class AbstractAuthentica /** * Sets the {@link BindingSession} the authentication provider lives in. */ + @Override public void setSession(BindingSession session) { this.session = session; } @@ -51,25 +52,31 @@ public abstract class AbstractAuthentica return session; } + @Override public Map<String, List<String>> getHTTPHeaders(String url) { return null; } + @Override public Element getSOAPHeaders(Object portObject) { return null; } + @Override public HandlerResolver getHandlerResolver() { return null; } + @Override public void putResponseHeaders(String url, int statusCode, Map<String, List<String>> headers) { } + @Override public SSLSocketFactory getSSLSocketFactory() { return null; } + @Override public HostnameVerifier getHostnameVerifier() { return null; } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.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/OAuthAuthenticationProvider.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/OAuthAuthenticationProvider.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/OAuthAuthenticationProvider.java Thu Aug 13 12:05:59 2015 @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; +import java.io.Serializable; import java.io.Writer; import java.net.HttpURLConnection; import java.net.URL; @@ -146,6 +147,7 @@ import org.slf4j.LoggerFactory; public class OAuthAuthenticationProvider extends StandardAuthenticationProvider { private static final Logger LOG = LoggerFactory.getLogger(OAuthAuthenticationProvider.class); + private static final String TOKEN_TYPE_BEARER = "bearer"; private static final long serialVersionUID = 1L; @@ -210,7 +212,7 @@ public class OAuthAuthenticationProvider headers = new HashMap<String, List<String>>(); } - headers.put("Authorization", Collections.singletonList("Bearer " + getAccessToken())); + headers.put("Authorization", Collections.singletonList(TOKEN_TYPE_BEARER + " " + getAccessToken())); return headers; } @@ -411,13 +413,13 @@ public class OAuthAuthenticationProvider JSONObject jsonResponse = parseResponse(conn); Object error = jsonResponse.get("error"); - String errorStr = (error == null ? null : error.toString()); + String errorStr = error == null ? null : error.toString(); Object description = jsonResponse.get("error_description"); - String descriptionStr = (description == null ? null : description.toString()); + String descriptionStr = description == null ? null : description.toString(); Object uri = jsonResponse.get("error_uri"); - String uriStr = (uri == null ? null : uri.toString()); + String uriStr = uri == null ? null : uri.toString(); if (LOG.isDebugEnabled()) { LOG.debug("OAuth token request failed: {}", jsonResponse.toJSONString()); @@ -431,7 +433,7 @@ public class OAuthAuthenticationProvider JSONObject jsonResponse = parseResponse(conn); Object tokenType = jsonResponse.get("token_type"); - if (!(tokenType instanceof String) || !"bearer".equalsIgnoreCase((String) tokenType)) { + if (!(tokenType instanceof String) || !TOKEN_TYPE_BEARER.equalsIgnoreCase((String) tokenType)) { throw new CmisOAuthException("Unsupported OAuth token type: " + tokenType); } @@ -479,8 +481,8 @@ public class OAuthAuthenticationProvider Map<String, Map<String, String>> challenges = MimeHelper.getChallengesFromAuthenticateHeader(conn .getHeaderField("WWW-Authenticate")); - if (challenges != null && challenges.containsKey("bearer")) { - Map<String, String> params = challenges.get("bearer"); + if (challenges != null && challenges.containsKey(TOKEN_TYPE_BEARER)) { + Map<String, String> params = challenges.get(TOKEN_TYPE_BEARER); String errorStr = params.get("error"); String descriptionStr = params.get("error_description"); @@ -549,7 +551,10 @@ public class OAuthAuthenticationProvider /** * Token holder class. */ - public static class Token { + public static class Token implements Serializable { + + private static final long serialVersionUID = 1L; + private String accessToken; private String refreshToken; private long expirationTimestamp; Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.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/atompub/AbstractAtomPubService.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/atompub/AbstractAtomPubService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.java Thu Aug 13 12:05:59 2015 @@ -160,7 +160,7 @@ public abstract class AbstractAtomPubSer } } - return (info == null ? CmisVersion.CMIS_1_0 : info.getCmisVersion()); + return info == null ? CmisVersion.CMIS_1_0 : info.getCmisVersion(); } // ---- link cache ---- @@ -204,6 +204,7 @@ public abstract class AbstractAtomPubSer * Gets a link from the cache if it is there or loads it into the cache if * it is not there. */ + @Override public String loadLink(String repositoryId, String id, String rel, String type) { String link = getLink(repositoryId, id, rel, type); if (link == null) { @@ -219,6 +220,7 @@ public abstract class AbstractAtomPubSer * Gets the content link from the cache if it is there or loads it into the * cache if it is not there. */ + @Override public String loadContentLink(String repositoryId, String id) { return loadLink(repositoryId, id, AtomPubParser.LINK_REL_CONTENT, null); } @@ -227,6 +229,7 @@ public abstract class AbstractAtomPubSer * Gets a rendition content link from the cache if it is there or loads it * into the cache if it is not there. */ + @Override public String loadRenditionContentLink(String repositoryId, String id, String streamId) { return loadLink(repositoryId, id, Constants.REL_ALTERNATE, streamId); } @@ -989,6 +992,7 @@ public abstract class AbstractAtomPubSer // update Response resp = put(aclUrl, Constants.MEDIATYPE_ACL, new Output() { + @Override public void write(OutputStream out) throws Exception { XMLStreamWriter writer = XMLUtils.createWriter(out); XMLUtils.startXmlDocument(writer); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AclServiceImpl.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/atompub/AclServiceImpl.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/atompub/AclServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AclServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -38,6 +38,7 @@ public class AclServiceImpl extends Abst setSession(session); } + @Override public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces, AclPropagation aclPropagation, ExtensionsData extension) { @@ -59,10 +60,12 @@ public class AclServiceImpl extends Abst return result; } + @Override public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) { return getAclInternal(repositoryId, objectId, onlyBasicPermissions, extension); } + @Override public Acl setAcl(String repositoryId, String objectId, Acl aces) { AtomAcl acl = updateAcl(repositoryId, objectId, aces, AclPropagation.OBJECTONLY); Acl result = acl.getACL(); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.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/atompub/AtomPubParser.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/atompub/AtomPubParser.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java Thu Aug 13 12:05:59 2015 @@ -50,6 +50,7 @@ import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -100,7 +101,7 @@ public class AtomPubParser { try { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName name = parser.getName(); if (XMLConstants.NAMESPACE_ATOM.equals(name.getNamespaceURI())) { @@ -164,7 +165,7 @@ public class AtomPubParser { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName name = parser.getName(); if (XMLConstants.NAMESPACE_APP.equals(name.getNamespaceURI())) { @@ -176,7 +177,7 @@ public class AtomPubParser { } else { XMLUtils.skip(parser); } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -198,7 +199,7 @@ public class AtomPubParser { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { AtomElement element = parseWorkspaceElement(parser); // check if we can extract the workspace id @@ -208,7 +209,7 @@ public class AtomPubParser { // add to workspace workspace.addElement(element); - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -232,7 +233,7 @@ public class AtomPubParser { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName name = parser.getName(); if (XMLConstants.NAMESPACE_ATOM.equals(name.getNamespaceURI())) { @@ -254,7 +255,7 @@ public class AtomPubParser { } else { XMLUtils.skip(parser); } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -279,7 +280,7 @@ public class AtomPubParser { // walk through all tags in entry while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { AtomElement element = parseElement(parser); if (element != null) { // add to entry @@ -292,7 +293,7 @@ public class AtomPubParser { result.setId(((TypeDefinition) element.getObject()).getId()); } } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -363,7 +364,7 @@ public class AtomPubParser { // walk through the children tag while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName name = parser.getName(); if (XMLConstants.NAMESPACE_ATOM.equals(name.getNamespaceURI())) { @@ -375,7 +376,7 @@ public class AtomPubParser { } else { XMLUtils.skip(parser); } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -430,7 +431,7 @@ public class AtomPubParser { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName tagName = parser.getName(); if (XMLConstants.NAMESPACE_RESTATOM.equals(tagName.getNamespaceURI()) && TAG_COLLECTION_TYPE.equals(tagName.getLocalPart())) { @@ -438,7 +439,7 @@ public class AtomPubParser { } else { XMLUtils.skip(parser); } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { @@ -463,7 +464,7 @@ public class AtomPubParser { while (true) { int event = parser.getEventType(); - if (event == XMLStreamReader.START_ELEMENT) { + if (event == XMLStreamConstants.START_ELEMENT) { QName tagName = parser.getName(); if (XMLConstants.NAMESPACE_RESTATOM.equals(tagName.getNamespaceURI())) { if (TAG_TEMPLATE_TEMPLATE.equals(tagName.getLocalPart())) { @@ -476,7 +477,7 @@ public class AtomPubParser { } else { XMLUtils.skip(parser); } - } else if (event == XMLStreamReader.END_ELEMENT) { + } else if (event == XMLStreamConstants.END_ELEMENT) { break; } else { if (!XMLUtils.next(parser)) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubConstants.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/atompub/CmisAtomPubConstants.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/atompub/CmisAtomPubConstants.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubConstants.java Thu Aug 13 12:05:59 2015 @@ -18,15 +18,11 @@ */ package org.apache.chemistry.opencmis.client.bindings.spi.atompub; - /** * Constants for AtomPub. */ public final class CmisAtomPubConstants { - private CmisAtomPubConstants() { - } - // service doc public static final String TAG_SERVICE = "service"; public static final String TAG_WORKSPACE = "workspace"; @@ -81,4 +77,6 @@ public final class CmisAtomPubConstants public static final String LINK_TYPE = "type"; public static final String CONTENT_SRC = "src"; + private CmisAtomPubConstants() { + } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.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/atompub/CmisAtomPubSpi.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/atompub/CmisAtomPubSpi.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java Thu Aug 13 12:05:59 2015 @@ -72,46 +72,57 @@ public class CmisAtomPubSpi implements C aclService = new AclServiceImpl(session); } + @Override public RepositoryService getRepositoryService() { return repositoryService; } + @Override public NavigationService getNavigationService() { return navigationService; } + @Override public ObjectService getObjectService() { return objectService; } + @Override public DiscoveryService getDiscoveryService() { return discoveryService; } + @Override public VersioningService getVersioningService() { return versioningService; } + @Override public MultiFilingService getMultiFilingService() { return multiFilingService; } + @Override public RelationshipService getRelationshipService() { return relationshipService; } + @Override public PolicyService getPolicyService() { return policyService; } + @Override public AclService getAclService() { return aclService; } + @Override public void clearAllCaches() { session.remove(SpiSessionParameter.LINK_CACHE); } + @Override public void clearRepositoryCache(String repositoryId) { LinkCache linkCache = (LinkCache) session.get(SpiSessionParameter.LINK_CACHE); if (linkCache != null) { @@ -119,6 +130,7 @@ public class CmisAtomPubSpi implements C } } + @Override public void close() { // no-op for AtomPub } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/DiscoveryServiceImpl.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/atompub/DiscoveryServiceImpl.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/atompub/DiscoveryServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/DiscoveryServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -59,6 +59,7 @@ public class DiscoveryServiceImpl extend setSession(session); } + @Override public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties, String filter, Boolean includePolicyIds, Boolean includeACL, BigInteger maxItems, ExtensionsData extension) { ObjectListImpl result = new ObjectListImpl(); @@ -149,6 +150,7 @@ public class DiscoveryServiceImpl extend return result; } + @Override public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { @@ -177,6 +179,7 @@ public class DiscoveryServiceImpl extend // post the query and parse results Response resp = post(url, Constants.MEDIATYPE_QUERY, new Output() { + @Override public void write(OutputStream out) throws Exception { XMLStreamWriter writer = XMLUtils.createWriter(out); XMLUtils.startXmlDocument(writer); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.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/atompub/MultiFilingServiceImpl.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/atompub/MultiFilingServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -44,6 +44,7 @@ public class MultiFilingServiceImpl exte setSession(session); } + @Override public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions, ExtensionsData extension) { if (objectId == null) { @@ -65,12 +66,14 @@ public class MultiFilingServiceImpl exte // post addObjectToFolder request postAndConsume(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } }); } + @Override public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) { if (objectId == null) { throw new CmisInvalidArgumentException("Object id must be set!"); @@ -91,6 +94,7 @@ public class MultiFilingServiceImpl exte // post removeObjectFromFolder request postAndConsume(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/NavigationServiceImpl.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/atompub/NavigationServiceImpl.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/atompub/NavigationServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/NavigationServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -60,6 +60,7 @@ public class NavigationServiceImpl exten setSession(session); } + @Override public ObjectInFolderList getChildren(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { @@ -135,6 +136,7 @@ public class NavigationServiceImpl exten return result; } + @Override public List<ObjectInFolderContainer> getDescendants(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, ExtensionsData extension) { @@ -165,6 +167,7 @@ public class NavigationServiceImpl exten return result; } + @Override public ObjectData getFolderParent(String repositoryId, String folderId, String filter, ExtensionsData extension) { ObjectData result = null; @@ -217,6 +220,7 @@ public class NavigationServiceImpl exten return result; } + @Override public List<ObjectInFolderContainer> getFolderTree(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, ExtensionsData extension) { @@ -247,6 +251,7 @@ public class NavigationServiceImpl exten return result; } + @Override public List<ObjectParentData> getObjectParents(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includeRelativePathSegment, ExtensionsData extension) { @@ -328,6 +333,7 @@ public class NavigationServiceImpl exten return result; } + @Override public ObjectList getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, 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/atompub/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/atompub/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/atompub/ObjectServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -84,6 +84,7 @@ public class ObjectServiceImpl extends A setSession(session); } + @Override public String createDocument(String repositoryId, Properties properties, String folderId, ContentStream contentStream, VersioningState versioningState, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) { @@ -119,6 +120,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -133,12 +135,14 @@ public class ObjectServiceImpl extends A return entry.getId(); } + @Override public String createDocumentFromSource(String repositoryId, String sourceId, Properties properties, String folderId, VersioningState versioningState, List<String> policies, Acl addACEs, Acl removeACEs, ExtensionsData extension) { throw new CmisNotSupportedException("createDocumentFromSource is not supported by the AtomPub binding!"); } + @Override public String createFolder(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) { checkCreateProperties(properties); @@ -158,6 +162,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -172,6 +177,7 @@ public class ObjectServiceImpl extends A return entry.getId(); } + @Override public String createPolicy(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) { checkCreateProperties(properties); @@ -205,6 +211,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -219,6 +226,7 @@ public class ObjectServiceImpl extends A return entry.getId(); } + @Override public String createItem(String repositoryId, Properties properties, String folderId, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) { checkCreateProperties(properties); @@ -248,6 +256,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -262,6 +271,7 @@ public class ObjectServiceImpl extends A return entry.getId(); } + @Override public String createRelationship(String repositoryId, Properties properties, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) { checkCreateProperties(properties); @@ -292,6 +302,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -306,6 +317,7 @@ public class ObjectServiceImpl extends A return entry.getId(); } + @Override public void updateProperties(String repositoryId, Holder<String> objectId, Holder<String> changeToken, Properties properties, ExtensionsData extension) { // we need an object id @@ -338,6 +350,7 @@ public class ObjectServiceImpl extends A // update Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -387,6 +400,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) { @@ -408,6 +422,7 @@ public class ObjectServiceImpl extends A // post the new folder object Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -446,6 +461,7 @@ public class ObjectServiceImpl extends A return result; } + @Override public void deleteObject(String repositoryId, String objectId, Boolean allVersions, ExtensionsData extension) { // find the link @@ -461,6 +477,7 @@ public class ObjectServiceImpl extends A delete(url); } + @Override public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) { @@ -547,6 +564,7 @@ public class ObjectServiceImpl extends A throw convertStatusCode(resp.getResponseCode(), resp.getResponseMessage(), resp.getErrorContent(), null); } + @Override public AllowableActions getAllowableActions(String repositoryId, String objectId, ExtensionsData extension) { // find the link String link = loadLink(repositoryId, objectId, Constants.REL_ALLOWABLEACTIONS, @@ -566,6 +584,7 @@ public class ObjectServiceImpl extends A return allowableActions.getAllowableActions(); } + @Override public ContentStream getContentStream(String repositoryId, String objectId, String streamId, BigInteger offset, BigInteger length, ExtensionsData extension) { // find the link @@ -619,6 +638,7 @@ public class ObjectServiceImpl extends A return result; } + @Override public ObjectData getObject(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) { @@ -627,6 +647,7 @@ public class ObjectServiceImpl extends A includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeACL, extension); } + @Override public ObjectData getObjectByPath(String repositoryId, String path, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds, Boolean includeACL, ExtensionsData extension) { @@ -635,6 +656,7 @@ public class ObjectServiceImpl extends A includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeACL, extension); } + @Override public Properties getProperties(String repositoryId, String objectId, String filter, ExtensionsData extension) { ObjectData object = getObjectInternal(repositoryId, IdentifierType.ID, objectId, ReturnVersion.THIS, filter, Boolean.FALSE, IncludeRelationships.NONE, "cmis:none", Boolean.FALSE, Boolean.FALSE, extension); @@ -642,6 +664,7 @@ public class ObjectServiceImpl extends A return object.getProperties(); } + @Override public List<RenditionData> getRenditions(String repositoryId, String objectId, String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { ObjectData object = getObjectInternal(repositoryId, IdentifierType.ID, objectId, ReturnVersion.THIS, @@ -656,6 +679,7 @@ public class ObjectServiceImpl extends A return result; } + @Override public void moveObject(String repositoryId, Holder<String> objectId, String targetFolderId, String sourceFolderId, ExtensionsData extension) { if (objectId == null || objectId.getValue() == null || objectId.getValue().length() == 0) { @@ -690,6 +714,7 @@ public class ObjectServiceImpl extends A // post move request Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -708,11 +733,13 @@ public class ObjectServiceImpl extends A objectId.setValue(entry.getId()); } + @Override public void setContentStream(String repositoryId, Holder<String> objectId, Boolean overwriteFlag, Holder<String> changeToken, ContentStream contentStream, ExtensionsData extension) { setOrAppendContent(repositoryId, objectId, overwriteFlag, changeToken, contentStream, true, false, extension); } + @Override public void deleteContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, ExtensionsData extension) { // we need an object id @@ -740,6 +767,7 @@ public class ObjectServiceImpl extends A } } + @Override public void appendContentStream(String repositoryId, Holder<String> objectId, Holder<String> changeToken, ContentStream contentStream, boolean isLastChunk, ExtensionsData extension) { setOrAppendContent(repositoryId, objectId, null, changeToken, contentStream, isLastChunk, true, extension); @@ -829,6 +857,7 @@ public class ObjectServiceImpl extends A // send content Response resp = put(url, contentStream.getMimeType(), headers, new Output() { + @Override public void write(OutputStream out) throws IOException { IOUtils.copy(stream, out); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/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/atompub/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/atompub/PolicyServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -52,6 +52,7 @@ public class PolicyServiceImpl extends A setSession(session); } + @Override public void applyPolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) { // find the link String link = loadLink(repositoryId, objectId, Constants.REL_POLICIES, Constants.MEDIATYPE_FEED); @@ -67,12 +68,14 @@ public class PolicyServiceImpl extends A // post applyPolicy request postAndConsume(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } }); } + @Override public List<ObjectData> getAppliedPolicies(String repositoryId, String objectId, String filter, ExtensionsData extension) { List<ObjectData> result = new ArrayList<ObjectData>(); @@ -112,6 +115,7 @@ public class PolicyServiceImpl extends A return result; } + @Override public void removePolicy(String repositoryId, String policyId, String objectId, ExtensionsData extension) { // we need a policy id if (policyId == null) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/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/atompub/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/atompub/RelationshipServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RelationshipServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -48,6 +48,7 @@ public class RelationshipServiceImpl ext setSession(session); } + @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/atompub/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/atompub/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/atompub/RepositoryServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -61,10 +61,12 @@ public class RepositoryServiceImpl exten setSession(session); } + @Override public List<RepositoryInfo> getRepositoryInfos(ExtensionsData extension) { return getRepositoriesInternal(null); } + @Override public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) { List<RepositoryInfo> repositoryInfos = getRepositoriesInternal(repositoryId); @@ -90,10 +92,12 @@ public class RepositoryServiceImpl exten throw new CmisObjectNotFoundException("Repository '" + repositoryId + "'not found!"); } + @Override public TypeDefinition getTypeDefinition(String repositoryId, String typeId, ExtensionsData extension) { return getTypeDefinitionInternal(repositoryId, typeId); } + @Override public TypeDefinitionList getTypeChildren(String repositoryId, String typeId, Boolean includePropertyDefinitions, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { TypeDefinitionListImpl result = new TypeDefinitionListImpl(); @@ -160,6 +164,7 @@ public class RepositoryServiceImpl exten return result; } + @Override public List<TypeDefinitionContainer> getTypeDescendants(String repositoryId, String typeId, BigInteger depth, Boolean includePropertyDefinitions, ExtensionsData extension) { List<TypeDefinitionContainer> result = new ArrayList<TypeDefinitionContainer>(); @@ -226,6 +231,7 @@ public class RepositoryServiceImpl exten } } + @Override public TypeDefinition createType(String repositoryId, TypeDefinition type, ExtensionsData extension) { if (type == null) { throw new CmisInvalidArgumentException("Type definition must be set!"); @@ -248,6 +254,7 @@ public class RepositoryServiceImpl exten // post the new type definition Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -282,6 +289,7 @@ public class RepositoryServiceImpl exten return result; } + @Override public TypeDefinition updateType(String repositoryId, TypeDefinition type, ExtensionsData extension) { if (type == null) { throw new CmisInvalidArgumentException("Type definition must be set!"); @@ -306,6 +314,7 @@ public class RepositoryServiceImpl exten // post the new type definition Response resp = put(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -340,6 +349,7 @@ public class RepositoryServiceImpl exten return result; } + @Override public void deleteType(String repositoryId, String typeId, ExtensionsData extension) { Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put(Constants.PARAM_ID, typeId); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/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/atompub/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/atompub/VersioningServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -67,6 +67,7 @@ public class VersioningServiceImpl exten setSession(session); } + @Override public void checkOut(String repositoryId, Holder<String> objectId, ExtensionsData extension, Holder<Boolean> contentCopied) { if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) { @@ -93,6 +94,7 @@ public class VersioningServiceImpl exten // post move request Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -123,6 +125,7 @@ public class VersioningServiceImpl exten } } + @Override public void cancelCheckOut(String repositoryId, String objectId, ExtensionsData extension) { // find the link String link = loadLink(repositoryId, objectId, Constants.REL_SELF, Constants.MEDIATYPE_ENTRY); @@ -141,6 +144,7 @@ public class VersioningServiceImpl exten delete(new UrlBuilder(link)); } + @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) { @@ -209,6 +213,7 @@ public class VersioningServiceImpl exten // update Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() { + @Override public void write(OutputStream out) throws XMLStreamException, IOException { entryWriter.write(out); } @@ -259,6 +264,7 @@ public class VersioningServiceImpl exten } } + @Override public List<ObjectData> getAllVersions(String repositoryId, String objectId, String versionSeriesId, String filter, Boolean includeAllowableActions, ExtensionsData extension) { List<ObjectData> result = new ArrayList<ObjectData>(); @@ -309,6 +315,7 @@ public class VersioningServiceImpl exten return result; } + @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) { @@ -322,6 +329,7 @@ public class VersioningServiceImpl exten includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeACL, extension); } + @Override public Properties getPropertiesOfLatestVersion(String repositoryId, String objectId, String versionSeriesId, Boolean major, String filter, ExtensionsData extension) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/AbstractBrowserBindingService.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/browser/AbstractBrowserBindingService.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/browser/AbstractBrowserBindingService.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/AbstractBrowserBindingService.java Thu Aug 13 12:05:59 2015 @@ -76,10 +76,12 @@ import org.apache.chemistry.opencmis.com public abstract class AbstractBrowserBindingService implements LinkAccess { protected static final ContainerFactory SIMPLE_CONTAINER_FACTORY = new ContainerFactory() { + @Override public Map<String, Object> createObjectContainer() { return new LinkedHashMap<String, Object>(); } + @Override public List<Object> creatArrayContainer() { return new ArrayList<Object>(); } @@ -96,11 +98,11 @@ public abstract class AbstractBrowserBin this.session = session; Object succintObj = session.get(SessionParameter.BROWSER_SUCCINCT); - this.succint = (succintObj == null ? true : Boolean.parseBoolean(succintObj.toString())); + this.succint = succintObj == null ? true : Boolean.parseBoolean(succintObj.toString()); Object dateTimeFormatObj = session.get(SessionParameter.BROWSER_DATETIME_FORMAT); - this.dateTimeFormat = (dateTimeFormatObj == null ? DateTimeFormat.SIMPLE : DateTimeFormat - .fromValue(dateTimeFormatObj.toString().toLowerCase(Locale.ENGLISH))); + this.dateTimeFormat = dateTimeFormatObj == null ? DateTimeFormat.SIMPLE : DateTimeFormat + .fromValue(dateTimeFormatObj.toString().toLowerCase(Locale.ENGLISH)); } /** @@ -501,16 +503,19 @@ public abstract class AbstractBrowserBin // ---- LinkAccess interface ---- + @Override public String loadLink(String repositoryId, String objectId, String rel, String type) { // AtomPub specific -> return null return null; } + @Override public String loadContentLink(String repositoryId, String documentId) { UrlBuilder result = getRepositoryUrlCache().getObjectUrl(repositoryId, documentId, Constants.SELECTOR_CONTENT); return result == null ? null : result.toString(); } + @Override public String loadRenditionContentLink(String repositoryId, String documentId, String streamId) { UrlBuilder result = getRepositoryUrlCache().getObjectUrl(repositoryId, documentId, Constants.SELECTOR_CONTENT); if (result != null) { Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/AclServiceImpl.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/browser/AclServiceImpl.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/browser/AclServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/AclServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -50,6 +50,7 @@ public class AclServiceImpl extends Abst setSession(session); } + @Override public Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension) { // build URL UrlBuilder url = getObjectUrl(repositoryId, objectId, Constants.SELECTOR_ACL); @@ -62,6 +63,7 @@ public class AclServiceImpl extends Abst return JSONConverter.convertAcl(json); } + @Override public Acl applyAcl(String repositoryId, String objectId, Acl addAces, Acl removeAces, AclPropagation aclPropagation, ExtensionsData extension) { // build URL @@ -75,6 +77,7 @@ public class AclServiceImpl extends Abst // send and parse Response resp = post(url, formData.getContentType(), new Output() { + @Override public void write(OutputStream out) throws IOException { formData.write(out); } @@ -84,6 +87,7 @@ public class AclServiceImpl extends Abst return JSONConverter.convertAcl(json); } + @Override public Acl setAcl(String repositoryId, String objectId, Acl aces) { Acl currentAcl = getAcl(repositoryId, objectId, false, null); Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ClientTypeCacheImpl.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/browser/ClientTypeCacheImpl.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/browser/ClientTypeCacheImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/ClientTypeCacheImpl.java Thu Aug 13 12:05:59 2015 @@ -34,6 +34,7 @@ public class ClientTypeCacheImpl impleme this.service = service; } + @Override public TypeDefinition getTypeDefinition(String typeId) { TypeDefinitionCache cache = CmisBindingsHelper.getTypeDefinitionCache(service.getSession()); @@ -49,6 +50,7 @@ public class ClientTypeCacheImpl impleme return type; } + @Override public TypeDefinition reloadTypeDefinition(String typeId) { TypeDefinitionCache cache = CmisBindingsHelper.getTypeDefinitionCache(service.getSession()); @@ -61,12 +63,14 @@ public class ClientTypeCacheImpl impleme return type; } + @Override public TypeDefinition getTypeDefinitionForObject(String objectId) { // not used assert false; return null; } + @Override public PropertyDefinition<?> getPropertyDefinition(String propId) { assert false; return null; Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.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/browser/CmisBrowserBindingSpi.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/browser/CmisBrowserBindingSpi.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java Thu Aug 13 12:05:59 2015 @@ -69,46 +69,57 @@ public class CmisBrowserBindingSpi imple aclService = new AclServiceImpl(session); } + @Override public RepositoryService getRepositoryService() { return repositoryService; } + @Override public NavigationService getNavigationService() { return navigationService; } + @Override public ObjectService getObjectService() { return objectService; } + @Override public VersioningService getVersioningService() { return versioningService; } + @Override public RelationshipService getRelationshipService() { return relationshipService; } + @Override public DiscoveryService getDiscoveryService() { return discoveryService; } + @Override public MultiFilingService getMultiFilingService() { return multiFilingService; } + @Override public AclService getAclService() { return aclService; } + @Override public PolicyService getPolicyService() { return policyService; } + @Override public void clearAllCaches() { session.remove(SpiSessionParameter.REPOSITORY_URL_CACHE); } + @Override public void clearRepositoryCache(String repositoryId) { RepositoryUrlCache repUrlCache = (RepositoryUrlCache) session.get(SpiSessionParameter.REPOSITORY_URL_CACHE); if (repUrlCache != null) { @@ -116,6 +127,7 @@ public class CmisBrowserBindingSpi imple } } + @Override public void close() { // no-op for Browser Binding } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/DiscoveryServiceImpl.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/browser/DiscoveryServiceImpl.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/browser/DiscoveryServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/DiscoveryServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -49,6 +49,7 @@ public class DiscoveryServiceImpl extend setSession(session); } + @Override public ObjectList query(String repositoryId, String statement, Boolean searchAllVersions, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { @@ -69,6 +70,7 @@ public class DiscoveryServiceImpl extend // send and parse Response resp = post(url, formData.getContentType(), new Output() { + @Override public void write(OutputStream out) throws IOException { formData.write(out); } @@ -80,6 +82,7 @@ public class DiscoveryServiceImpl extend return JSONConverter.convertObjectList(json, typeCache, true); } + @Override public ObjectList getContentChanges(String repositoryId, Holder<String> changeLogToken, Boolean includeProperties, String filter, Boolean includePolicyIds, Boolean includeAcl, BigInteger maxItems, ExtensionsData extension) { // build URL Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/FormDataWriter.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/browser/FormDataWriter.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/browser/FormDataWriter.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/FormDataWriter.java Thu Aug 13 12:05:59 2015 @@ -230,11 +230,11 @@ public final class FormDataWriter { } public String getContentType() { - return (contentStream == null ? CONTENT_TYPE_URLENCODED : CONTENT_TYPE_FORMDATA + boundary); + return contentStream == null ? CONTENT_TYPE_URLENCODED : CONTENT_TYPE_FORMDATA + boundary; } public void write(OutputStream out) throws IOException { - InputStream stream = (contentStream == null ? null : contentStream.getStream()); + InputStream stream = contentStream == null ? null : contentStream.getStream(); if (stream == null) { boolean first = true; @@ -294,7 +294,6 @@ public final class FormDataWriter { } private void writeLine(OutputStream out, String s) throws IOException { - s = (s == null ? CRLF : s + CRLF); - out.write(IOUtils.toUTF8Bytes(s)); + out.write(IOUtils.toUTF8Bytes(s == null ? CRLF : s + CRLF)); } } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/MultiFilingServiceImpl.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/browser/MultiFilingServiceImpl.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/browser/MultiFilingServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/MultiFilingServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -40,6 +40,7 @@ public class MultiFilingServiceImpl exte setSession(session); } + @Override public void addObjectToFolder(String repositoryId, String objectId, String folderId, Boolean allVersions, ExtensionsData extension) { // build URL @@ -52,12 +53,14 @@ public class MultiFilingServiceImpl exte // send and parse postAndConsume(url, formData.getContentType(), new Output() { + @Override public void write(OutputStream out) throws IOException { formData.write(out); } }); } + @Override public void removeObjectFromFolder(String repositoryId, String objectId, String folderId, ExtensionsData extension) { // build URL UrlBuilder url = getObjectUrl(repositoryId, objectId); @@ -68,6 +71,7 @@ public class MultiFilingServiceImpl exte // send and parse postAndConsume(url, formData.getContentType(), new Output() { + @Override public void write(OutputStream out) throws IOException { formData.write(out); } Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/NavigationServiceImpl.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/browser/NavigationServiceImpl.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/browser/NavigationServiceImpl.java (original) +++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/NavigationServiceImpl.java Thu Aug 13 12:05:59 2015 @@ -49,6 +49,7 @@ public class NavigationServiceImpl exten setSession(session); } + @Override public ObjectInFolderList getChildren(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) { @@ -74,6 +75,7 @@ public class NavigationServiceImpl exten return JSONConverter.convertObjectInFolderList(json, typeCache); } + @Override public List<ObjectInFolderContainer> getDescendants(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, ExtensionsData extension) { @@ -97,6 +99,7 @@ public class NavigationServiceImpl exten return JSONConverter.convertDescendants(json, typeCache); } + @Override public List<ObjectInFolderContainer> getFolderTree(String repositoryId, String folderId, BigInteger depth, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includePathSegment, ExtensionsData extension) { @@ -120,6 +123,7 @@ public class NavigationServiceImpl exten return JSONConverter.convertDescendants(json, typeCache); } + @Override public List<ObjectParentData> getObjectParents(String repositoryId, String objectId, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, Boolean includeRelativePathSegment, ExtensionsData extension) { @@ -142,6 +146,7 @@ public class NavigationServiceImpl exten return JSONConverter.convertObjectParents(json, typeCache); } + @Override public ObjectData getFolderParent(String repositoryId, String folderId, String filter, ExtensionsData extension) { // build URL UrlBuilder url = getObjectUrl(repositoryId, folderId, Constants.SELECTOR_PARENT); @@ -158,6 +163,7 @@ public class NavigationServiceImpl exten return JSONConverter.convertObject(json, typeCache); } + @Override public ObjectList getCheckedOutDocs(String repositoryId, String folderId, String filter, String orderBy, Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter, BigInteger maxItems, BigInteger skipCount, ExtensionsData extension) {
