You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/11 20:36:12 UTC
svn commit: r1833353 - in /jackrabbit/branches/2.8: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ j...
Author: reschke
Date: Mon Jun 11 20:36:12 2018
New Revision: 1833353
URL: http://svn.apache.org/viewvc?rev=1833353&view=rev
Log:
JCR-4237 - cleanup throws clauses of private methods (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
jackrabbit/branches/2.8/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
jackrabbit/branches/2.8/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 11 20:36:12 2018
@@ -2,4 +2,4 @@
/jackrabbit/branches/2.14:1813154
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1821597,1822947,1822950,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1819269,1821597,1822947,1822950,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java Mon Jun 11 20:36:12 2018
@@ -408,10 +408,9 @@ public class ItemManager implements Item
* in which case the itemId present with the specified <code>data</code> is used.
* @return true if the item with the given <code>data</code> can be read;
* <code>false</code> otherwise.
- * @throws AccessDeniedException
* @throws RepositoryException
*/
- private boolean canRead(ItemData data, Path path) throws AccessDeniedException, RepositoryException {
+ private boolean canRead(ItemData data, Path path) throws RepositoryException {
// JCR-1601: cached item may just have been invalidated
ItemState state = data.getState();
if (state == null) {
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Mon Jun 11 20:36:12 2018
@@ -644,11 +644,10 @@ public class NodeTypeManagerImpl extends
*
* @param definition the definition
* @return a <code>NodeTypeDef</code>
- * @throws InvalidNodeTypeDefinitionException if the definition is invalid
* @throws RepositoryException if a repository error occurs
*/
private QNodeTypeDefinition toNodeTypeDef(NodeTypeDefinition definition)
- throws InvalidNodeTypeDefinitionException, RepositoryException {
+ throws RepositoryException {
return new QNodeTypeDefinitionImpl(definition, context, QValueFactoryImpl.getInstance());
}
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Mon Jun 11 20:36:12 2018
@@ -155,8 +155,7 @@ class RowIteratorImpl implements RowIter
NamePathResolver resolver,
ValueFactory valueFactory,
ExcerptProvider exProvider,
- SpellSuggestion spellSuggestion)
- throws NamespaceException {
+ SpellSuggestion spellSuggestion) {
this.scoreNodes = scoreNodes;
this.columns = columns;
this.selectorNames.addAll(Arrays.asList(selectorNames));
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLEditor.java Mon Jun 11 20:36:12 2018
@@ -282,10 +282,9 @@ public class ACLEditor extends Protected
*
* @param path the path
* @return the node
- * @throws PathNotFoundException if not found
* @throws RepositoryException if an error occurs
*/
- private NodeImpl getNode(String path) throws PathNotFoundException, RepositoryException {
+ private NodeImpl getNode(String path) throws RepositoryException {
return (NodeImpl) session.getNode(path);
}
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Mon Jun 11 20:36:12 2018
@@ -987,8 +987,7 @@ public class SharedItemStateManager
}
}
- private void addReferences(PropertyState property) throws NoSuchItemStateException,
- ItemStateException {
+ private void addReferences(PropertyState property) throws ItemStateException {
if (property.getType() == PropertyType.REFERENCE) {
InternalValue[] values = property.getValues();
for (int i = 0; values != null && i < values.length; i++) {
@@ -1018,7 +1017,7 @@ public class SharedItemStateManager
}
private void removeReferences(ItemState state)
- throws NoSuchItemStateException, ItemStateException {
+ throws ItemStateException {
if (!state.isNode()) {
PropertyState property = (PropertyState) state;
if (property.getType() == PropertyType.REFERENCE) {
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java Mon Jun 11 20:36:12 2018
@@ -440,10 +440,8 @@ abstract public class VersionManagerImpl
* Returns a set of nodeid from the jcr:mergeFailed property of the given state
* @param state the state
* @return set of node ids
- * @throws RepositoryException if an error occurs
*/
- private Set<NodeId> getMergeFailed(NodeStateEx state)
- throws RepositoryException {
+ private Set<NodeId> getMergeFailed(NodeStateEx state) {
Set<NodeId> set = new HashSet<NodeId>();
if (state.hasProperty(NameConstants.JCR_MERGEFAILED)) {
InternalValue[] vals = state.getPropertyValues(NameConstants.JCR_MERGEFAILED);
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java Mon Jun 11 20:36:12 2018
@@ -271,10 +271,8 @@ public class ClientEventPoll extends Thr
*
* @param remoteEvent The {@link RemoteEventCollection.RemoteEvent} instance
* providing the data for this event.
- *
- * @throws RemoteException if an RMI error occurrs.
*/
- private JCREvent(RemoteEventCollection.RemoteEvent remoteEvent) throws RemoteException {
+ private JCREvent(RemoteEventCollection.RemoteEvent remoteEvent) {
remote = remoteEvent;
}
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SysViewContentHandler.java Mon Jun 11 20:36:12 2018
@@ -557,10 +557,9 @@ class SysViewContentHandler extends Defa
* @param nodeElem The node to check.
* @param noRecurse Boolean if child nodes should be exported at all.
* @throws RepositoryException
- * @throws SAXException
*/
private void checkChildren(NodeElemData nodeElem, boolean noRecurse)
- throws RepositoryException, SAXException {
+ throws RepositoryException {
Hashtable<String, ChildNodeElem> childElemsFound = nodeElem.childNodeElemNames;
boolean totalSumOk = false;
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=1833353&r1=1833352&r2=1833353&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Mon Jun 11 20:36:12 2018
@@ -770,12 +770,11 @@ public class RepositoryStartupServlet ex
* @param req the request
* @param resp the response
* @param loc the location for the redirect
- * @throws ServletException if an servlet error occurs.
* @throws IOException if an I/O error occurs.
*/
private void redirect(HttpServletRequest req,
HttpServletResponse resp, String loc)
- throws ServletException, IOException {
+ throws IOException {
String cp = req.getContextPath();
if (cp == null || cp.equals("/")) {
cp = "";