Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A3140200BD2 for ; Sat, 3 Dec 2016 11:08:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A19A7160B0E; Sat, 3 Dec 2016 10:08:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 23E3B160B09 for ; Sat, 3 Dec 2016 11:08:33 +0100 (CET) Received: (qmail 91140 invoked by uid 500); 3 Dec 2016 10:08:33 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 91130 invoked by uid 99); 3 Dec 2016 10:08:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2016 10:08:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id ABD8EC03A5 for ; Sat, 3 Dec 2016 10:08:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id sY4w4jBZpjNh for ; Sat, 3 Dec 2016 10:08:28 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id DF1F25F5F7 for ; Sat, 3 Dec 2016 10:08:27 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 34967E01DC for ; Sat, 3 Dec 2016 10:08:27 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E03433A0334 for ; Sat, 3 Dec 2016 10:08:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1772444 - /jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Date: Sat, 03 Dec 2016 10:08:26 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161203100826.E03433A0334@svn01-us-west.apache.org> archived-at: Sat, 03 Dec 2016 10:08:35 -0000 Author: reschke Date: Sat Dec 3 10:08:26 2016 New Revision: 1772444 URL: http://svn.apache.org/viewvc?rev=1772444&view=rev Log: JCR-4064: Refactor WebDAV related code out of HttpClient3-specific classes for better future re-use consistent use of @Override Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1772444&r1=1772443&r2=1772444&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original) +++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Sat Dec 3 10:08:26 2016 @@ -655,38 +655,33 @@ public class RepositoryServiceImpl imple } //--------------------------------------------------< RepositoryService >--- - /** - * @see RepositoryService#getIdFactory() - */ + + @Override public IdFactory getIdFactory() { return idFactory; } - /** - * @see RepositoryService#getNameFactory() - */ + @Override public NameFactory getNameFactory() { return nameFactory; } - /** - * @see RepositoryService#getPathFactory() - */ + @Override public PathFactory getPathFactory() { return pathFactory; } + @Override public QValueFactory getQValueFactory() { return qValueFactory; } + @Override public ItemInfoCache getItemInfoCache(SessionInfo sessionInfo) throws RepositoryException { return new ItemInfoCacheImpl(itemInfoCacheSize); } - /** - * @see RepositoryService#getRepositoryDescriptors() - */ + @Override public Map getRepositoryDescriptors() throws RepositoryException { if (descriptors.isEmpty()) { ReportInfo info = new ReportInfo(JcrRemotingConstants.REPORT_REPOSITORY_DESCRIPTORS, ItemResourceConstants.NAMESPACE); @@ -743,21 +738,21 @@ public class RepositoryServiceImpl imple return descriptors; } - /** - * @see RepositoryService#obtain(Credentials, String) - */ + @Override public SessionInfo obtain(Credentials credentials, String workspaceName) throws LoginException, NoSuchWorkspaceException, RepositoryException { CredentialsWrapper dc = new CredentialsWrapper(credentials); return obtain(dc, workspaceName); } + @Override public SessionInfo obtain(SessionInfo sessionInfo, String workspaceName) throws LoginException, NoSuchWorkspaceException, RepositoryException { checkSessionInfo(sessionInfo); return obtain(((SessionInfoImpl)sessionInfo).getCredentials(), workspaceName); } + @Override public SessionInfo impersonate(SessionInfo sessionInfo, Credentials credentials) throws LoginException, RepositoryException { throw new UnsupportedOperationException("Not implemented yet."); } @@ -827,14 +822,13 @@ public class RepositoryServiceImpl imple return sessionInfo; } + @Override public void dispose(SessionInfo sessionInfo) throws RepositoryException { checkSessionInfo(sessionInfo); removeClient(sessionInfo); } - /** - * @see RepositoryService#getWorkspaceNames(SessionInfo) - */ + @Override public String[] getWorkspaceNames(SessionInfo sessionInfo) throws RepositoryException { DavPropertyNameSet nameSet = new DavPropertyNameSet(); nameSet.add(DeltaVConstants.WORKSPACE); @@ -865,9 +859,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#isGranted(SessionInfo, ItemId, String[] actions) - */ + @Override public boolean isGranted(SessionInfo sessionInfo, ItemId itemId, String[] actions) throws RepositoryException { ReportMethod method = null; try { @@ -1026,16 +1018,12 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getNodeDefinition(SessionInfo, NodeId) - */ + @Override public QNodeDefinition getNodeDefinition(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException { return (QNodeDefinition) getItemDefinition(sessionInfo, nodeId); } - /** - * @see RepositoryService#getPropertyDefinition(SessionInfo, PropertyId) - */ + @Override public QPropertyDefinition getPropertyDefinition(SessionInfo sessionInfo, PropertyId propertyId) throws RepositoryException { return (QPropertyDefinition) getItemDefinition(sessionInfo, propertyId); } @@ -1105,9 +1093,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getNodeInfo(SessionInfo, NodeId) - */ + @Override public NodeInfo getNodeInfo(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException { // set of properties to be retrieved DavPropertyNameSet nameSet = new DavPropertyNameSet(); @@ -1185,9 +1171,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getItemInfos(SessionInfo, ItemId) - */ + @Override public Iterator getItemInfos(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException { // TODO: implement batch read properly: // currently: missing 'value/values' property PropertyInfo cannot be built @@ -1259,9 +1243,7 @@ public class RepositoryServiceImpl imple return l; } - /** - * @see RepositoryService#getChildInfos(SessionInfo, NodeId) - */ + @Override public Iterator getChildInfos(SessionInfo sessionInfo, NodeId parentId) throws RepositoryException { // set of properties to be retrieved DavPropertyNameSet nameSet = new DavPropertyNameSet(); @@ -1318,9 +1300,7 @@ public class RepositoryServiceImpl imple return new ChildInfoImpl(qName, uuid, index); } - /** - * @see RepositoryService#getReferences(SessionInfo, NodeId, Name, boolean) - */ + @Override public Iterator getReferences(SessionInfo sessionInfo, NodeId nodeId, Name propertyName, boolean weakReferences) throws ItemNotFoundException, RepositoryException { // set of properties to be retrieved DavPropertyNameSet nameSet = new DavPropertyNameSet(); @@ -1369,9 +1349,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getPropertyInfo(SessionInfo, PropertyId) - */ + @Override public PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId) throws RepositoryException { GetMethod method = null; try { @@ -1509,17 +1487,13 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#createBatch(SessionInfo,ItemId) - */ + @Override public Batch createBatch(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException { checkSessionInfo(sessionInfo); return new BatchImpl(itemId, sessionInfo); } - /** - * @see RepositoryService#submit(Batch) - */ + @Override public void submit(Batch batch) throws RepositoryException { if (!(batch instanceof BatchImpl)) { throw new RepositoryException("Unknown Batch implementation."); @@ -1566,9 +1540,7 @@ public class RepositoryServiceImpl imple return new DocumentTree(nodeName, primaryTypeName, uniqueId, getNamePathResolver(sessionInfo)); } - /** - * @see RepositoryService#importXml(SessionInfo, NodeId, InputStream, int) - */ + @Override public void importXml(SessionInfo sessionInfo, NodeId parentId, InputStream xmlStream, int uuidBehaviour) throws RepositoryException { // TODO: improve. currently random name is built instead of retrieving name of new resource from top-level xml element within stream Name nodeName = getNameFactory().create(Name.NS_DEFAULT_URI, UUID.randomUUID().toString()); @@ -1579,9 +1551,7 @@ public class RepositoryServiceImpl imple execute(method, sessionInfo); } - /** - * @see RepositoryService#move(SessionInfo, NodeId, NodeId, Name) - */ + @Override public void move(SessionInfo sessionInfo, NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException { String uri = getItemUri(srcNodeId, sessionInfo); String destUri = getItemUri(destParentNodeId, destName, sessionInfo); @@ -1594,9 +1564,7 @@ public class RepositoryServiceImpl imple clearItemUriCache(sessionInfo); } - /** - * @see RepositoryService#copy(SessionInfo, String, NodeId, NodeId, Name) - */ + @Override public void copy(SessionInfo sessionInfo, String srcWorkspaceName, NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException { String uri = uriResolver.getItemUri(srcNodeId, srcWorkspaceName, sessionInfo); String destUri = getItemUri(destParentNodeId, destName, sessionInfo); @@ -1607,9 +1575,7 @@ public class RepositoryServiceImpl imple execute(method, sessionInfo); } - /** - * @see RepositoryService#update(SessionInfo, NodeId, String) - */ + @Override public void update(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName) throws RepositoryException { String uri = getItemUri(nodeId, sessionInfo); String workspUri = uriResolver.getWorkspaceUri(srcWorkspaceName); @@ -1617,17 +1583,13 @@ public class RepositoryServiceImpl imple update(uri, null, new String[] {workspUri}, UpdateInfo.UPDATE_BY_WORKSPACE, false, sessionInfo); } - /** - * @see RepositoryService#clone(SessionInfo, String, NodeId, NodeId, Name, boolean) - */ + @Override public void clone(SessionInfo sessionInfo, String srcWorkspaceName, NodeId srcNodeId, NodeId destParentNodeId, Name destName, boolean removeExisting) throws RepositoryException { // TODO: missing implementation throw new UnsupportedOperationException("Missing implementation"); } - /** - * @see RepositoryService#getLockInfo(SessionInfo, NodeId) - */ + @Override public LockInfo getLockInfo(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException { // set of Dav-properties to be retrieved DavPropertyNameSet nameSet = new DavPropertyNameSet(); @@ -1672,17 +1634,13 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#lock(SessionInfo, NodeId, boolean, boolean) - */ + @Override public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped) throws RepositoryException { return lock(sessionInfo, nodeId, deep, sessionScoped, Long.MAX_VALUE, null); } - /** - * @see RepositoryService#lock(SessionInfo, NodeId, boolean, boolean, long, String) - */ + @Override public LockInfo lock(SessionInfo sessionInfo, NodeId nodeId, boolean deep, boolean sessionScoped, long timeoutHint, String ownerHint) throws UnsupportedRepositoryOperationException, LockException, AccessDeniedException, RepositoryException { try { checkSessionInfo(sessionInfo); @@ -1706,9 +1664,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#refreshLock(SessionInfo, NodeId) - */ + @Override public void refreshLock(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException { checkSessionInfo(sessionInfo); String uri = getItemUri(nodeId, sessionInfo); @@ -1720,9 +1676,7 @@ public class RepositoryServiceImpl imple execute(method, sessionInfo); } - /** - * @see RepositoryService#unlock(SessionInfo, NodeId) - */ + @Override public void unlock(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException { checkSessionInfo(sessionInfo); String uri = getItemUri(nodeId, sessionInfo); @@ -1783,9 +1737,7 @@ public class RepositoryServiceImpl imple return new LockInfoImpl(activeLock, holder == null ? nodeId : holder, ((SessionInfoImpl)sessionInfo).getAllLockTokens()); } - /** - * @see RepositoryService#checkin(SessionInfo, NodeId) - */ + @Override public NodeId checkin(SessionInfo sessionInfo, NodeId nodeId) throws VersionException, UnsupportedRepositoryOperationException, InvalidItemStateException, LockException, RepositoryException { String uri = getItemUri(nodeId, sessionInfo); CheckinMethod method = new CheckinMethod(uri); @@ -1794,18 +1746,14 @@ public class RepositoryServiceImpl imple return uriResolver.getNodeId(resolve(uri, rh.getValue()), sessionInfo); } - /** - * @see RepositoryService#checkout(SessionInfo, NodeId) - */ + @Override public void checkout(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException, LockException, RepositoryException { String uri = getItemUri(nodeId, sessionInfo); CheckoutMethod method = new CheckoutMethod(uri); execute(method, sessionInfo); } - /** - * @see RepositoryService#checkout(SessionInfo, NodeId, NodeId) - */ + @Override public void checkout(SessionInfo sessionInfo, NodeId nodeId, NodeId activityId) throws UnsupportedRepositoryOperationException, LockException, RepositoryException { if (activityId == null) { checkout(sessionInfo, nodeId); @@ -1815,9 +1763,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#checkpoint(SessionInfo, NodeId) - */ + @Override public NodeId checkpoint(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException, RepositoryException { // TODO review again. NodeId vID = checkin(sessionInfo, nodeId); @@ -1825,9 +1771,7 @@ public class RepositoryServiceImpl imple return vID; } - /** - * @see RepositoryService#checkpoint(SessionInfo, NodeId, NodeId) - */ + @Override public NodeId checkpoint(SessionInfo sessionInfo, NodeId nodeId, NodeId activityId) throws UnsupportedRepositoryOperationException, RepositoryException { if (activityId == null) { return checkpoint(sessionInfo, nodeId); @@ -1837,18 +1781,14 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#removeVersion(SessionInfo, NodeId, NodeId) - */ + @Override public void removeVersion(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId) throws RepositoryException { String uri = getItemUri(versionId, sessionInfo); DeleteMethod method = new DeleteMethod(uri); execute(method, sessionInfo); } - /** - * @see RepositoryService#restore(SessionInfo, NodeId, NodeId, boolean) - */ + @Override public void restore(SessionInfo sessionInfo, NodeId nodeId, NodeId versionId, boolean removeExisting) throws RepositoryException { String uri = getItemUri(nodeId, sessionInfo); String vUri = getItemUri(versionId, sessionInfo); @@ -1896,9 +1836,7 @@ public class RepositoryServiceImpl imple } - /** - * @see RepositoryService#restore(SessionInfo, NodeId[], boolean) - */ + @Override public void restore(SessionInfo sessionInfo, NodeId[] versionIds, boolean removeExisting) throws RepositoryException { String uri = uriResolver.getWorkspaceUri(sessionInfo.getWorkspaceName()); String[] vUris = new String[versionIds.length]; @@ -1938,16 +1876,12 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#merge(SessionInfo, NodeId, String, boolean) - */ + @Override public Iterator merge(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName, boolean bestEffort) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { return merge(sessionInfo, nodeId, srcWorkspaceName, bestEffort, false); } - /** - * @see RepositoryService#merge(SessionInfo, NodeId, String, boolean, boolean) - */ + @Override public Iterator merge(SessionInfo sessionInfo, NodeId nodeId, String srcWorkspaceName, boolean bestEffort, boolean isShallow) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { try { Document doc = DomUtil.createDocument(); @@ -1978,9 +1912,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#resolveMergeConflict(SessionInfo, NodeId, NodeId[], NodeId[]) - */ + @Override public void resolveMergeConflict(SessionInfo sessionInfo, NodeId nodeId, NodeId[] mergeFailedIds, NodeId[] predecessorIds) throws VersionException, InvalidItemStateException, UnsupportedRepositoryOperationException, RepositoryException { try { List changeList = new ArrayList(); @@ -2005,9 +1937,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#addVersionLabel(SessionInfo,NodeId,NodeId,Name,boolean) - */ + @Override public void addVersionLabel(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId, Name label, boolean moveLabel) throws VersionException, RepositoryException { try { String uri = getItemUri(versionId, sessionInfo); @@ -2019,9 +1949,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#removeVersionLabel(SessionInfo,NodeId,NodeId,Name) - */ + @Override public void removeVersionLabel(SessionInfo sessionInfo, NodeId versionHistoryId, NodeId versionId, Name label) throws VersionException, RepositoryException { try { String uri = getItemUri(versionId, sessionInfo); @@ -2033,41 +1961,31 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#createActivity(SessionInfo, String) - */ + @Override public NodeId createActivity(SessionInfo sessionInfo, String title) throws UnsupportedRepositoryOperationException, RepositoryException { // TODO throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); } - /** - * @see RepositoryService#removeActivity(SessionInfo, NodeId) - */ + @Override public void removeActivity(SessionInfo sessionInfo, NodeId activityId) throws UnsupportedRepositoryOperationException, RepositoryException { // TODO throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); } - /** - * @see RepositoryService#mergeActivity(SessionInfo, NodeId) - */ + @Override public Iterator mergeActivity(SessionInfo sessionInfo, NodeId activityId) throws UnsupportedRepositoryOperationException, RepositoryException { // TODO throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); } - /** - * @see RepositoryService#createConfiguration(SessionInfo, NodeId) - */ + @Override public NodeId createConfiguration(SessionInfo sessionInfo, NodeId nodeId) throws UnsupportedRepositoryOperationException, RepositoryException { // TODO throw new UnsupportedOperationException("JCR-2104: JSR 283 Versioning. Implementation missing"); } - /** - * @see RepositoryService#getSupportedQueryLanguages(SessionInfo) - */ + @Override public String[] getSupportedQueryLanguages(SessionInfo sessionInfo) throws RepositoryException { OptionsMethod method = new OptionsMethod(uriResolver.getWorkspaceUri(sessionInfo.getWorkspaceName())); try { @@ -2086,6 +2004,7 @@ public class RepositoryServiceImpl imple } } + @Override public String[] checkQueryStatement(SessionInfo sessionInfo, String statement, String language, @@ -2095,9 +2014,7 @@ public class RepositoryServiceImpl imple return new String[0]; } - /** - * @see RepositoryService#executeQuery(SessionInfo, String, String,java.util.Map,long,long,java.util.Map - */ + @Override public QueryInfo executeQuery(SessionInfo sessionInfo, String statement, String language, Map namespaces, long limit, long offset, Map values) throws RepositoryException { SearchMethod method = null; try { @@ -2135,9 +2052,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#createEventFilter(SessionInfo, int, Path, boolean, String[], Name[], boolean) - */ + @Override public EventFilter createEventFilter(SessionInfo sessionInfo, int eventTypes, Path absPath, @@ -2165,9 +2080,7 @@ public class RepositoryServiceImpl imple resolvedTypeNames, noLocal); } - /** - * @see RepositoryService#getEvents(Subscription, long) - */ + @Override public EventBundle[] getEvents(Subscription subscription, long timeout) throws RepositoryException, UnsupportedRepositoryOperationException { checkSubscription(subscription); @@ -2178,9 +2091,7 @@ public class RepositoryServiceImpl imple return poll(rootUri, subscr.getId(), timeout, subscr.getSessionInfo()); } - /** - * @see RepositoryService#getEvents(SessionInfo, EventFilter, long) - */ + @Override public EventBundle getEvents(SessionInfo sessionInfo, EventFilter filter, long after) throws RepositoryException, UnsupportedRepositoryOperationException { // TODO: use filters remotely (JCR-3179) @@ -2241,9 +2152,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#createSubscription(SessionInfo, EventFilter[]) - */ + @Override public Subscription createSubscription(SessionInfo sessionInfo, EventFilter[] filters) throws UnsupportedRepositoryOperationException, RepositoryException { @@ -2263,9 +2172,7 @@ public class RepositoryServiceImpl imple return new EventSubscriptionImpl(subscriptionId, (SessionInfoImpl) sessionInfo); } - /** - * @see RepositoryService#updateEventFilters(Subscription, EventFilter[]) - */ + @Override public void updateEventFilters(Subscription subscription, EventFilter[] filters) throws RepositoryException { @@ -2293,6 +2200,7 @@ public class RepositoryServiceImpl imple } } + @Override public void dispose(Subscription subscription) throws RepositoryException { checkSubscription(subscription); EventSubscriptionImpl subscr = (EventSubscriptionImpl) subscription; @@ -2505,9 +2413,7 @@ public class RepositoryServiceImpl imple return events; } - /** - * @see RepositoryService#getRegisteredNamespaces(SessionInfo) - */ + @Override public Map getRegisteredNamespaces(SessionInfo sessionInfo) throws RepositoryException { ReportInfo info = new ReportInfo(JcrRemotingConstants.REPORT_REGISTERED_NAMESPACES, ItemResourceConstants.NAMESPACE); ReportMethod method = null; @@ -2551,9 +2457,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getNamespaceURI(SessionInfo, String) - */ + @Override public String getNamespaceURI(SessionInfo sessionInfo, String prefix) throws NamespaceException, RepositoryException { try { @@ -2565,9 +2469,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getNamespacePrefix(SessionInfo, String) - */ + @Override public String getNamespacePrefix(SessionInfo sessionInfo, String uri) throws NamespaceException, RepositoryException { try { @@ -2579,9 +2481,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#registerNamespace(SessionInfo, String, String) - */ + @Override public void registerNamespace(SessionInfo sessionInfo, String prefix, String uri) throws NamespaceException, UnsupportedRepositoryOperationException, AccessDeniedException, RepositoryException { // make sure we have them all getRegisteredNamespaces(sessionInfo); @@ -2596,9 +2496,7 @@ public class RepositoryServiceImpl imple nsCache.add(prefix, uri); } - /** - * @see RepositoryService#unregisterNamespace(SessionInfo, String) - */ + @Override public void unregisterNamespace(SessionInfo sessionInfo, String uri) throws NamespaceException, UnsupportedRepositoryOperationException, AccessDeniedException, RepositoryException { // make sure we have them all getRegisteredNamespaces(sessionInfo); @@ -2646,9 +2544,7 @@ public class RepositoryServiceImpl imple } } - /** - * @see RepositoryService#getQNodeTypeDefinitions(SessionInfo) - */ + @Override public Iterator getQNodeTypeDefinitions(SessionInfo sessionInfo) throws RepositoryException { ReportMethod method = null; try { @@ -2675,18 +2571,14 @@ public class RepositoryServiceImpl imple } } - /** - * {@inheritDoc} - */ + @Override public Iterator getQNodeTypeDefinitions(SessionInfo sessionInfo, Name[] nodetypeNames) throws RepositoryException { // in order to avoid individual calls for every nodetype, retrieve // the complete set from the server (again). return getQNodeTypeDefinitions(sessionInfo); } - /** - * {@inheritDoc} - */ + @Override public void registerNodeTypes(SessionInfo sessionInfo, QNodeTypeDefinition[] nodeTypeDefinitions, boolean allowUpdate) throws InvalidNodeTypeDefinitionException, NodeTypeExistsException, UnsupportedRepositoryOperationException, RepositoryException { PropPatchMethod method = null; try { @@ -2708,9 +2600,7 @@ public class RepositoryServiceImpl imple } } - /** - * {@inheritDoc} - */ + @Override public void unregisterNodeTypes(SessionInfo sessionInfo, Name[] nodeTypeNames) throws UnsupportedRepositoryOperationException, NoSuchNodeTypeException, RepositoryException { PropPatchMethod method = null; try { @@ -2732,9 +2622,7 @@ public class RepositoryServiceImpl imple } } - /** - * {@inheritDoc} - */ + @Override public void createWorkspace(SessionInfo sessionInfo, String name, String srcWorkspaceName) throws AccessDeniedException, UnsupportedRepositoryOperationException, NoSuchWorkspaceException, RepositoryException { if (srcWorkspaceName != null) { throw new UnsupportedOperationException("JCR-2003. Implementation missing"); @@ -2757,9 +2645,7 @@ public class RepositoryServiceImpl imple } } - /** - * {@inheritDoc} - */ + @Override public void deleteWorkspace(SessionInfo sessionInfo, String name) throws AccessDeniedException, UnsupportedRepositoryOperationException, NoSuchWorkspaceException, RepositoryException { DeleteMethod method = null; try { @@ -3353,9 +3239,7 @@ public class RepositoryServiceImpl imple this.sessionInfo = sessionInfo; } - /** - * @inheritDoc - */ + @Override public String getURI(String prefix) throws NamespaceException { try { return getNamespaceURI(sessionInfo, prefix); @@ -3365,9 +3249,7 @@ public class RepositoryServiceImpl imple } } - /** - * @inheritDoc - */ + @Override public String getPrefix(String uri) throws NamespaceException { try { return getNamespacePrefix(sessionInfo, uri); @@ -3396,9 +3278,7 @@ public class RepositoryServiceImpl imple return ((SessionInfoImpl) sessionInfo).getNamePathResolver().getQPath(jcrPath); } - /** - * @inheritDoc - */ + @Override public Path getPath(String identifier) throws MalformedPathException { try { int pos = identifier.indexOf('/'); @@ -3418,9 +3298,7 @@ public class RepositoryServiceImpl imple } } - /** - * @inheritDoc - */ + @Override public void checkFormat(String identifier) throws MalformedPathException { // cannot be determined. assume ok. } @@ -3446,37 +3324,27 @@ public class RepositoryServiceImpl imple pResolver = new ParsingPathResolver(getPathFactory(), nResolver); } - /** - * @inheritDoc - */ + @Override public Name getQName(String jcrName) throws IllegalNameException, NamespaceException { return nResolver.getQName(jcrName); } - /** - * @inheritDoc - */ + @Override public String getJCRName(Name qName) throws NamespaceException { return nResolver.getJCRName(qName); } - /** - * @inheritDoc - */ + @Override public Path getQPath(String path) throws MalformedPathException, IllegalNameException, NamespaceException { return pResolver.getQPath(path); } - /** - * @inheritDoc - */ + @Override public Path getQPath(String path, boolean normalizeIdentifier) throws MalformedPathException, IllegalNameException, NamespaceException { return pResolver.getQPath(path, normalizeIdentifier); } - /** - * @inheritDoc - */ + @Override public String getJCRPath(Path path) throws NamespaceException { return pResolver.getJCRPath(path); } @@ -3506,6 +3374,7 @@ public class RepositoryServiceImpl imple //----------------------------------------------< NamespaceResolver >--- + @Override public String getURI(String prefix) throws NamespaceException { String uri = prefixToURI.get(prefix); if (uri != null) { @@ -3515,6 +3384,7 @@ public class RepositoryServiceImpl imple } } + @Override public String getPrefix(String uri) throws NamespaceException { String prefix = uriToPrefix.get(uri); if (prefix != null) {