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 2022/01/19 11:46:28 UTC

[jackrabbit-filevault] branch feature/JCRVLT-596 updated: Revert "JCRVLT-596: try to detect whether a policy was set (test failing)"

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch feature/JCRVLT-596
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


The following commit(s) were added to refs/heads/feature/JCRVLT-596 by this push:
     new 3b4c338  Revert "JCRVLT-596: try to detect whether a policy was set (test failing)"
3b4c338 is described below

commit 3b4c3388a1e2407e230cfb5c2a115afcc07b020e
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Jan 19 12:46:13 2022 +0100

    Revert "JCRVLT-596: try to detect whether a policy was set (test failing)"
    
    This reverts commit 06fcdf928b3dd72a8e239750f7289d483113a80f.
---
 .../apache/jackrabbit/vault/fs/io/ImportOptions.java   | 18 ++++--------------
 .../vault/packaging/impl/JcrPackageImpl.java           |  3 ---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
index 7372b95..2fa7f53 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ImportOptions.java
@@ -67,7 +67,7 @@ public class ImportOptions {
 
     private DependencyHandling dependencyHandling = null;
 
-    private IdConflictPolicy idConflictPolicy = null;
+    private @NotNull IdConflictPolicy idConflictPolicy = IdConflictPolicy.FAIL;
 
     private Boolean overwritePrimaryTypesOfFolders = null;
 
@@ -456,14 +456,7 @@ public class ImportOptions {
      * @since 3.5.1
      */
     public @NotNull IdConflictPolicy getIdConflictPolicy() {
-        return idConflictPolicy != null ? idConflictPolicy : IdConflictPolicy.FAIL;
-    }
-
-    /**
-     * @since 3.5.10
-     */
-    public boolean hasIdConflictPolicyBeenSet() {
-        return idConflictPolicy != null;
+        return idConflictPolicy;
     }
 
     /**
@@ -565,10 +558,7 @@ public class ImportOptions {
             return false;
         if (overwritePrimaryTypesOfFolders != other.overwritePrimaryTypesOfFolders)
             return false;
-        if (idConflictPolicy == null) {
-            if (other.idConflictPolicy != null)
-                return false;
-        } else if (!idConflictPolicy.equals(other.idConflictPolicy))
+        if (!idConflictPolicy.equals(other.idConflictPolicy))
             return false;
         return true;
     }
@@ -587,6 +577,6 @@ public class ImportOptions {
                 + (pathMapping != null ? "pathMapping=" + pathMapping + ", " : "")
                 + (dependencyHandling != null ? "dependencyHandling=" + dependencyHandling + ", " : "")
                 + "overwritePrimaryTypesOfFolders=" + overwritePrimaryTypesOfFolders + ", "
-                + "idConflictPolicy=" + (idConflictPolicy != null ? idConflictPolicy : IdConflictPolicy.FAIL) + "]";
+                + "idConflictPolicy=" + idConflictPolicy + "]";
     }
 }
\ No newline at end of file
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
index af74a2b..ee5320c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java
@@ -386,9 +386,6 @@ public class JcrPackageImpl implements JcrPackage {
             // MAX_VALUE disables saving completely, therefore we have to use a lower value!
             opts.setAutoSaveThreshold(Integer.MAX_VALUE - 1);
         }
-        if (!opts.hasIdConflictPolicyBeenSet()) {
-            opts.setIdConflictPolicy(mgr.getDefaultIdConflictPolicy());
-        }
         opts.setIdConflictPolicy(mgr.getDefaultIdConflictPolicy());
         InstallContextImpl ctx = pack.prepareExtract(node.getSession(), opts, mgr.getSecurityConfig(), mgr.isStrictByDefault(),
                 mgr.overwritePrimaryTypesOfFoldersByDefault());