(jackrabbit-oak) branch trunk updated: OAK-11612 : removed usages of Guava's Sets.union (#2197)

[daim]

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

daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 305a3d6035 OAK-11612 : removed usages of Guava's Sets.union (#2197)
305a3d6035 is described below

commit 305a3d603569557ceac8907543962957b944a6d2
Author: Rishabh Kumar <rishabhdaim1...@gmail.com>
AuthorDate: Sat Apr 5 06:26:08 2025 +0530

    OAK-11612 : removed usages of Guava's Sets.union (#2197)
    
    * OAK-11612 : removed usages of Guava's Sets.union
    
    * OAK-11612 : incorporated review comments
    
    ---------
    
    Co-authored-by: Rishabh Kumar <d...@adobe.com>
---
 .../org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java    | 5 +++--
 .../java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
index 1b3b2b349f..b83d0562ec 100755
--- 
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
+++ 
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
@@ -71,7 +71,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Sets.union;
 import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier.copyProperties;
@@ -473,7 +472,9 @@ public class RepositorySidegrade {
         }
         excludes.add("/:async");
 
-        final Set<String> merges = 
union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), 
Set.of("/jcr:system"));
+        final Set<String> merges = SetUtils.toLinkedSet(this.mergePaths);
+        merges.add("/jcr:system");
+
         NodeStateCopier.builder()
             .include(includes)
             .exclude(excludes.build())
diff --git 
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
 
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
index 827bc7eabc..4c4f3a1fa0 100644
--- 
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
+++ 
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.upgrade;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Sets.union;
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static 
org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState.ALL;
 import static 
org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState.NONE;
@@ -940,8 +939,11 @@ public class RepositoryUpgrade {
     private String copyWorkspace(NodeState sourceRoot, NodeBuilder targetRoot, 
String workspaceName)
             throws RepositoryException {
         final Set<String> includes = 
calculateEffectiveIncludePaths(includePaths, sourceRoot);
-        final Set<String> excludes = 
union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.excludePaths)), 
Set.of("/jcr:system/jcr:versionStorage"));
-        final Set<String> merges = 
union(Collections.unmodifiableSet(SetUtils.toLinkedSet(this.mergePaths)), 
Set.of("/jcr:system"));
+        final Set<String> excludes = SetUtils.toLinkedSet(this.excludePaths);
+        excludes.add("/jcr:system/jcr:versionStorage");
+
+        final Set<String> merges = SetUtils.toLinkedSet(this.mergePaths);
+        merges.add("/jcr:system");
 
         logger.info("Copying workspace {} [i: {}, e: {}, m: {}]", 
workspaceName, includes, excludes, merges);