svn commit: r1866618 - in /jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io: DocViewAdapter.java JackrabbitACLImporter.java

[kw...@apache.org]

Author: kwin
Date: Sun Sep  8 15:25:00 2019
New Revision: 1866618

URL: http://svn.apache.org/viewvc?rev=1866618&view=rev
Log:
JCRVLT-287 throw RepositoryException in case of ACL Importer failures

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAdapter.java
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JackrabbitACLImporter.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAdapter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAdapter.java?rev=1866618&r1=1866617&r2=1866618&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAdapter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewAdapter.java Sun Sep  8 15:25:00 2019
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.vault.fs.i
 
 import java.util.List;
 
+import javax.jcr.RepositoryException;
+
 import org.apache.jackrabbit.vault.util.DocViewNode;
 import org.xml.sax.SAXException;
 
@@ -31,21 +33,24 @@ public interface DocViewAdapter {
     /**
      * Start node is invoked when the importer descends into an element.
      * @param node the node
-     * @throws SAXException if an error occurrs
+     * @throws SAXException if a parsing error occurs.
+     * @throws RepositoryException if a import exception occurs.
      */
-    void startNode(DocViewNode node) throws SAXException;
+    void startNode(DocViewNode node) throws SAXException, RepositoryException;
 
     /**
      * Ends node is invoked when the importer ascends from an element.
-     * @throws SAXException if an error occurrs.
+     * @throws SAXException if a parsing error occurs.
+     * @throws RepositoryException if a import exception occurs.
      */
-    void endNode() throws SAXException;
+    void endNode() throws SAXException, RepositoryException;
 
     /**
      * Is called by the importer if the adapter is no longer used and must finalize the import.
-     * @throws SAXException if an error occurrs.
+     * @throws SAXException if a parsing error occurs.
+     * @throws RepositoryException if a import exception occurs.
      * @return The paths that were created.
      */
-    List<String> close() throws SAXException;
+    List<String> close() throws SAXException, RepositoryException;
 
 }
\ No newline at end of file

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JackrabbitACLImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JackrabbitACLImporter.java?rev=1866618&r1=1866617&r2=1866618&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JackrabbitACLImporter.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JackrabbitACLImporter.java Sun Sep  8 15:25:00 2019
@@ -72,7 +72,7 @@ public class JackrabbitACLImporter imple
 
     private final String accessControlledPath;
 
-    private ImportedPolicy importPolicy;
+    private ImportedPolicy<? extends AccessControlPolicy> importPolicy;
 
     private enum State {
         INITIAL,
@@ -146,16 +146,12 @@ public class JackrabbitACLImporter imple
         importPolicy.endNode(state);
     }
 
-    public List<String> close() throws SAXException {
+    public List<String> close() throws SAXException, RepositoryException {
         if (states.peek() != State.INITIAL) {
             log.error("Unexpected end state: {}", states.peek());
         }
-        List<String> paths = new ArrayList<String>();
-        try {
-            importPolicy.apply(paths);
-        } catch (RepositoryException e) {
-            log.error("Error while applying access control content.", e);
-        }
+        List<String> paths = new ArrayList<>();
+        importPolicy.apply(paths);
         return paths;
     }