OAK-11602 : revert changes from 7 modules

Rishabh Kumar · Rishabh Kumar · commit 94e738395cb3 · 2025-03-14T12:30:32.000+05:30
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipals.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipals.java
@@ -33,6 +33,7 @@
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -221,7 +222,7 @@ private Map<Principal, Group> collectGlobalAutoMembershipPrincipals(@NotNull Str
                 }
             }
             // only cache the principal instance but not the group (tree might become disconnected)
-            principalMap.put(idpName, SetUtils.toLinkedSet(map.keySet()));
+            principalMap.put(idpName, Collections.unmodifiableSet(SetUtils.toLinkedSet(map.keySet())));
         } else {
             // resolve Group objects from cached principals
             principalMap.get(idpName).forEach(groupPrincipal -> {
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProvider.java
@@ -200,7 +200,7 @@ private Map<String, Set<String>> getAutomembership(boolean memberIsGroup) {
         
         private static void updateAutoMembershipMap(@NotNull Map<String, Set<String>> map, @NotNull String syncHandlerName, 
                                                     @NotNull String idpName, @NotNull String[] membership) {
-            Set<String> userMembership = SetUtils.toLinkedSet(membership);
+            Set<String> userMembership = Collections.unmodifiableSet(SetUtils.toLinkedSet(membership));
             Set<String> previous = map.put(idpName, userMembership);
             if (previous != null) {
                 String msg = previous.equals(userMembership) ? "Duplicate" : "Colliding";
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
@@ -328,7 +328,7 @@ public boolean isMember(@NotNull Group group, @NotNull Authorizable authorizable
                 return Collections.emptyIterator();
             }
 
-            Set<Value> valueSet = SetUtils.toLinkedSet(vs);
+            Set<Value> valueSet = Collections.unmodifiableSet(SetUtils.toLinkedSet(vs));
             Iterator<Group> declared = Iterators.filter(Iterators.transform(valueSet.iterator(), value -> {
                 try {
                     String groupPrincipalName = value.getString();
diff --git a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
@@ -374,7 +374,7 @@ private Set<String> collectEffectiveCandidates(@NotNull Root r, @NotNull Iterabl
                 Tree cug = CugUtil.getCug(t);
                 PropertyState pNames = (cug == null) ? null : cug.getProperty(REP_PRINCIPAL_NAMES);
                 if (pNames != null) {
-                    if (!Collections.disjoint(SetUtils.toLinkedSet(principalNames), SetUtils.toLinkedSet(pNames.getValue(Type.STRINGS)))) {
+                    if (!Collections.disjoint(ImmutableSet.copyOf(principalNames), ImmutableSet.copyOf(pNames.getValue(Type.STRINGS)))) {
                         candidates.add(path);
                     }
                     nestedCugPaths(cug).forEach(eval::add);
diff --git a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImpl.java
@@ -20,10 +20,8 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugExclude;
 import org.jetbrains.annotations.NotNull;
 import org.osgi.service.component.annotations.Activate;
@@ -82,6 +80,6 @@ protected void modified(Map<String, Object> properties) {
     }
 
     private void setPrincipalNames(@NotNull Map<String, Object> properties) {
-        this.principalNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(PropertiesUtil.toStringArray(properties.get("principalNames"), new String[0])));
+        this.principalNames = ImmutableSet.copyOf(PropertiesUtil.toStringArray(properties.get("principalNames"), new String[0]));
     }
 }
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
@@ -65,7 +65,7 @@ public MountInfo(String name, boolean readOnly, List<String> pathsSupportingFrag
         this.readOnly = readOnly;
         this.pathFragmentName = "oak:mount-" + name;
         this.includedPaths = cleanCopy(includedPaths);
-        this.pathsSupportingFragments = SetUtils.toLinkedSet(pathsSupportingFragments);
+        this.pathsSupportingFragments = Collections.unmodifiableSet(SetUtils.toLinkedSet(pathsSupportingFragments));
     }
 
     @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
@@ -45,6 +45,7 @@
 import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 import java.security.Principal;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -177,7 +178,7 @@ private CredentialsSupport newCredentialsSupport() {
         } else if (size == 1) {
             return credentialsSupport.values().iterator().next();
         } else {
-            return CompositeCredentialsSupport.newInstance(() -> SetUtils.toLinkedSet(credentialsSupport.values()));
+            return CompositeCredentialsSupport.newInstance(() -> Collections.unmodifiableSet(SetUtils.toLinkedSet(credentialsSupport.values())));
         }
     }
 }
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java
@@ -35,6 +35,7 @@
 
 import javax.jcr.NamespaceRegistry;
 
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
 
@@ -100,7 +101,7 @@ class CurrentPattern implements RestrictionPattern {
 
     CurrentPattern(@NotNull String treePath, @NotNull Iterable<String> propertyNames) {
         this.treePath = treePath;
-        this.propertyNames = SetUtils.toLinkedSet(propertyNames);
+        this.propertyNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(propertyNames));
     }
 
     @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNamePattern.java
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.security.authorization.restriction;
 
+import java.util.Collections;
 import java.util.Set;
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -38,7 +39,7 @@ class ItemNamePattern implements RestrictionPattern {
     private final Set<String> names;
 
     ItemNamePattern(Iterable<String> names) {
-        this.names = SetUtils.toLinkedSet(names);
+        this.names = Collections.unmodifiableSet(SetUtils.toLinkedSet(names));
     }
 
     @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/NodeTypePattern.java
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.security.authorization.restriction;
 
+import java.util.Collections;
 import java.util.Set;
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -42,7 +43,7 @@ class NodeTypePattern implements RestrictionPattern {
     private final Set<String> nodeTypeNames;
 
     NodeTypePattern(@NotNull Iterable<String> nodeTypeNames) {
-        this.nodeTypeNames = SetUtils.toLinkedSet(nodeTypeNames);
+        this.nodeTypeNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(nodeTypeNames));
     }
 
     @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.security.authorization.restriction;
 
+import java.util.Collections;
 import java.util.Set;
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -46,7 +47,7 @@ class PrefixPattern implements RestrictionPattern {
     private final Set<String> prefixes;
 
     PrefixPattern(@NotNull Iterable<String> prefixes) {
-        this.prefixes = SetUtils.toLinkedSet(prefixes);
+        this.prefixes = Collections.unmodifiableSet(SetUtils.toLinkedSet(prefixes));
     }
 
     @Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
@@ -18,6 +18,7 @@
  */
 package org.apache.jackrabbit.oak.security.user;
 
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -82,7 +83,7 @@ public Resolution changeDeletedProperty(@NotNull NodeBuilder parent, @NotNull Pr
     public Resolution changeChangedProperty(@NotNull NodeBuilder parent, @NotNull PropertyState ours,
             @NotNull PropertyState theirs, @NotNull PropertyState base) {
         if (isRepMembersProperty(theirs)) {
-            Set<String> baseMembers = SetUtils.toLinkedSet(base.getValue(Type.STRINGS));
+            Set<String> baseMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(base.getValue(Type.STRINGS)));
             mergeChange(parent, ours, theirs, baseMembers);
             return Resolution.MERGED;
         } else {
@@ -158,8 +159,8 @@ private static void mergeChange(@NotNull NodeBuilder parent, @NotNull PropertySt
         PropertyBuilder<String> merged = PropertyBuilder.array(Type.WEAKREFERENCE);
         merged.setName(UserConstants.REP_MEMBERS);
 
-        Set<String> theirMembers = SetUtils.toLinkedSet(theirs.getValue(Type.STRINGS));
-        Set<String> ourMembers = SetUtils.toLinkedSet(ours.getValue(Type.STRINGS));
+        Set<String> theirMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(theirs.getValue(Type.STRINGS)));
+        Set<String> ourMembers = Collections.unmodifiableSet(SetUtils.toLinkedSet(ours.getValue(Type.STRINGS)));
 
         // merge ours and theirs to a de-duplicated set
         Set<String> combined = new LinkedHashSet<>(Sets.intersection(ourMembers, theirMembers));
diff --git a/oak-doc/src/site/markdown/security/user/default.md b/oak-doc/src/site/markdown/security/user/default.md
@@ -326,7 +326,7 @@ implementation.
         //------------------------------------------------< SCR Integration >---
         @Activate
         private void activate(Map<String, Object> properties) {
-             ids = SetUtils.toLinkedSet(PropertiesUtil.toStringArray(properties.get("ids"), new String[0]));
+             ids = ImmutableSet.copyOf(PropertiesUtil.toStringArray(properties.get("ids"), new String[0]));
         }
     }
 
diff --git a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
@@ -39,6 +39,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.security.Principal;
+import java.util.Collections;
 import java.util.Set;
 
 class ThreeRolesPermissionProvider implements AggregatedPermissionProvider, ThreeRolesConstants {
@@ -62,7 +63,7 @@ class ThreeRolesPermissionProvider implements AggregatedPermissionProvider, Thre
                                  @NotNull String supportedPath, @NotNull Context ctx,
                                  @NotNull RootProvider rootProvider) {
         this.root = root;
-        this.principalNames = SetUtils.toLinkedSet(IterableUtils.transform(principals, Principal::getName));
+        this.principalNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(IterableUtils.transform(principals, Principal::getName)));
         this.supportedPath = supportedPath;
         this.ctx = ctx;
         this.rootProvider = rootProvider;
@@ -167,7 +168,7 @@ public Set<String> getPrivileges(@Nullable Tree tree) {
 
     @Override
     public boolean hasPrivileges(@Nullable Tree tree, @NotNull String... privilegeNames) {
-        return getPrivileges(tree).containsAll(SetUtils.toLinkedSet(privilegeNames));
+        return getPrivileges(tree).containsAll(Collections.unmodifiableSet(SetUtils.toLinkedSet(privilegeNames)));
     }
 
     @NotNull
diff --git a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
@@ -37,7 +37,7 @@ class CustomPrincipalProvider implements PrincipalProvider {
     private final Set<String> knownPrincipalNames;
 
     CustomPrincipalProvider(String[] knownPrincipalNames) {
-        this.knownPrincipalNames = SetUtils.toLinkedSet(knownPrincipalNames);
+        this.knownPrincipalNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(knownPrincipalNames));
     }
 
     @Nullable
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnReadDirectory.java
@@ -35,7 +35,6 @@
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.commons.PerfLogger;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FilterDirectory;
@@ -333,7 +332,7 @@ private void removeDeletedFiles() throws IOException {
 
         Set<String> filesToBeDeleted =
                 // Files present locally
-                SetUtils.toLinkedSet(local.listAll()).stream()
+                ImmutableSet.copyOf(local.listAll()).stream()
                 // but not in my view
                 .filter(name -> !remoteFiles.contains(name))
                 // and also older than a safe timestamp (deleteBeforeTS)
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java
@@ -341,7 +341,7 @@ private Set<String> getListing(){
         if (fileNames == null){
             fileNames = directoryBuilder.getChildNodeNames();
         }
-        Set<String> result = SetUtils.toLinkedSet(fileNames);
+        Set<String> result = ImmutableSet.copyOf(fileNames);
         PERF_LOGGER.end(start, 100, "Directory listing performed. Total {} files", result.size());
         return result;
     }
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java
@@ -31,7 +31,6 @@
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
@@ -69,7 +68,7 @@ public void validate() throws CommitFailedException {
             String propertyRelativePath = e.getKey();
             String value = e.getValue();
             Iterable<String> indexedPaths = getIndexedPaths(propertyRelativePath, value);
-            Set<String> allPaths = SetUtils.toLinkedSet(indexedPaths);
+            Set<String> allPaths = ImmutableSet.copyOf(indexedPaths);
 
             //If more than one match found then filter out stale paths
             if (allPaths.size() > 1) {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/PathElementComparator.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/PathElementComparator.java
@@ -35,7 +35,7 @@ public PathElementComparator() {
     }
 
     public PathElementComparator(Iterable<String> preferredPathElements) {
-        this.preferred = SetUtils.toLinkedSet(preferredPathElements);
+        this.preferred = Collections.unmodifiableSet(SetUtils.toLinkedSet(preferredPathElements));
     }
 
     @Override
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java
@@ -340,9 +340,8 @@ public void execute(String... args) throws Exception {
                 System.err.println("unknown revisions command: " + subCmd);
             }
             if (exitWhenDone) {
-                LOG.warn("Exiting with system, exit code is 0");
                 System.out.printf("Command '%s' completed successfully.%n", subCmd);
-//                System.exit(0);
+                System.exit(0);
             }
         } catch (Throwable e) {
             LOG.error("Command failed", e);
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
@@ -29,7 +29,6 @@
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -307,13 +306,13 @@ private static Set<?> convertToSet(@NotNull Object configProperty, @NotNull Clas
         if (configProperty instanceof Set) {
             return (Set) configProperty;
         } else if (configProperty instanceof Collection<?>) {
-            return Collections.unmodifiableSet(SetUtils.toLinkedSet((Collection<?>) configProperty));
+            return ImmutableSet.copyOf((Collection<?>) configProperty);
         } else if (configProperty.getClass().isArray()) {
-            return Collections.unmodifiableSet(SetUtils.toLinkedSet((Object[]) configProperty));
+            return ImmutableSet.copyOf((Object[]) configProperty);
         } else {
             String[] arr = PropertiesUtil.toStringArray(configProperty);
             if (arr != null) {
-                return Collections.unmodifiableSet(SetUtils.toLinkedSet(arr));
+                return ImmutableSet.copyOf(arr);
             } else {
                 String str = configProperty.toString();
                 log.warn("Unsupported target type {} for value {}", clazz.getName(), str);
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
@@ -27,7 +27,6 @@
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.oak.api.AuthInfo;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,7 +48,7 @@ public AuthInfoImpl(@Nullable String userID, @Nullable Map<String, ?> attributes
                         @Nullable Iterable<? extends Principal> principals) {
         this.userID = userID;
         this.attributes = (attributes == null) ? Collections.emptyMap() : attributes;
-        this.principals = (principals == null) ? Collections.emptySet() : Collections.unmodifiableSet(SetUtils.toLinkedSet(principals));
+        this.principals = (principals == null) ? Collections.emptySet() : ImmutableSet.copyOf(principals);
     }
 
     public static AuthInfo createFromSubject(@NotNull Subject subject) {
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupport.java
@@ -26,7 +26,6 @@
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.guava.common.collect.Maps;
 
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -66,7 +65,8 @@ public String getUserId(@NotNull Credentials credentials) {
     public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
         if (credentials instanceof SimpleCredentials) {
             final SimpleCredentials sc = (SimpleCredentials) credentials;
-            return Maps.asMap(Collections.unmodifiableSet(SetUtils.toLinkedSet(sc.getAttributeNames())), sc::getAttribute);
+            return Maps.asMap(ImmutableSet.copyOf(sc.getAttributeNames()),
+                    input -> sc.getAttribute(input));
         } else {
             return Collections.emptyMap();
         }
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
@@ -19,7 +19,6 @@
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
 import org.apache.jackrabbit.api.security.authorization.PrivilegeCollection;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.value.jcr.PartialValueFactory;
 import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
@@ -77,7 +76,7 @@ public ACE(@Nullable Principal principal, @Nullable PrivilegeBits privilegeBits,
         this.principal = principal;
         this.privilegeBits = privilegeBits;
         this.isAllow = isAllow;
-        this.restrictions = (restrictions == null) ? Collections.emptySet() : Collections.unmodifiableSet(restrictions);
+        this.restrictions = (restrictions == null) ? Collections.emptySet() : ImmutableSet.copyOf(restrictions);
         this.namePathMapper = namePathMapper;
         this.valueFactory = new PartialValueFactory(namePathMapper);
     }
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
@@ -35,7 +35,6 @@
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
 import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
 import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
@@ -71,7 +70,7 @@ public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable String oakP
         if (isUnsupportedPath(oakPath)) {
             return Collections.emptySet();
         } else {
-            return Collections.unmodifiableSet(SetUtils.toLinkedSet(supported.values()));
+            return ImmutableSet.copyOf(supported.values());
         }
     }
 
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java
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
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

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public boolean isMember(@NotNull Group group, @NotNull Authorizable authorizable`
`328`	`328`	`return Collections.emptyIterator();`
`329`	`329`	`}`
`330`	`330`
`331`		`- Set<Value> valueSet = SetUtils.toLinkedSet(vs);`
	`331`	`+ Set<Value> valueSet = Collections.unmodifiableSet(SetUtils.toLinkedSet(vs));`
`332`	`332`	`Iterator<Group> declared = Iterators.filter(Iterators.transform(valueSet.iterator(), value -> {`
`333`	`333`	`try {`
`334`	`334`	`String groupPrincipalName = value.getString();`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ private Set<String> collectEffectiveCandidates(@NotNull Root r, @NotNull Iterabl`
`374`	`374`	`Tree cug = CugUtil.getCug(t);`
`375`	`375`	`PropertyState pNames = (cug == null) ? null : cug.getProperty(REP_PRINCIPAL_NAMES);`
`376`	`376`	`if (pNames != null) {`
`377`		`- if (!Collections.disjoint(SetUtils.toLinkedSet(principalNames), SetUtils.toLinkedSet(pNames.getValue(Type.STRINGS)))) {`
	`377`	`+ if (!Collections.disjoint(ImmutableSet.copyOf(principalNames), ImmutableSet.copyOf(pNames.getValue(Type.STRINGS)))) {`
`378`	`378`	`candidates.add(path);`
`379`	`379`	`}`
`380`	`380`	`nestedCugPaths(cug).forEach(eval::add);`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,8 @@`
`20`	`20`	`import java.util.Collections;`
`21`	`21`	`import java.util.Map;`
`22`	`22`	`import java.util.Set;`
`23`		`-`
`24`	`23`	`import org.apache.jackrabbit.guava.common.collect.ImmutableSet;`
`25`	`24`	`import org.apache.jackrabbit.oak.commons.PropertiesUtil;`
`26`		`-import org.apache.jackrabbit.oak.commons.collections.SetUtils;`
`27`	`25`	`import org.apache.jackrabbit.oak.spi.security.authorization.cug.CugExclude;`
`28`	`26`	`import org.jetbrains.annotations.NotNull;`
`29`	`27`	`import org.osgi.service.component.annotations.Activate;`
`@@ -82,6 +80,6 @@ protected void modified(Map<String, Object> properties) {`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`private void setPrincipalNames(@NotNull Map<String, Object> properties) {`
`85`		`- this.principalNames = Collections.unmodifiableSet(SetUtils.toLinkedSet(PropertiesUtil.toStringArray(properties.get("principalNames"), new String[0])));`
	`83`	`+ this.principalNames = ImmutableSet.copyOf(PropertiesUtil.toStringArray(properties.get("principalNames"), new String[0]));`
`86`	`84`	`}`
`87`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public MountInfo(String name, boolean readOnly, List<String> pathsSupportingFrag`
`65`	`65`	`this.readOnly = readOnly;`
`66`	`66`	`this.pathFragmentName = "oak:mount-" + name;`
`67`	`67`	`this.includedPaths = cleanCopy(includedPaths);`
`68`		`- this.pathsSupportingFragments = SetUtils.toLinkedSet(pathsSupportingFragments);`
	`68`	`+ this.pathsSupportingFragments = Collections.unmodifiableSet(SetUtils.toLinkedSet(pathsSupportingFragments));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`import org.osgi.service.metatype.annotations.ObjectClassDefinition;`
`46`	`46`
`47`	`47`	`import java.security.Principal;`
	`48`	`+import java.util.Collections;`
`48`	`49`	`import java.util.List;`
`49`	`50`	`import java.util.Map;`
`50`	`51`	`import java.util.Set;`
`@@ -177,7 +178,7 @@ private CredentialsSupport newCredentialsSupport() {`
`177`	`178`	`} else if (size == 1) {`
`178`	`179`	`return credentialsSupport.values().iterator().next();`
`179`	`180`	`} else {`
`180`		`- return CompositeCredentialsSupport.newInstance(() -> SetUtils.toLinkedSet(credentialsSupport.values()));`
	`181`	`+ return CompositeCredentialsSupport.newInstance(() -> Collections.unmodifiableSet(SetUtils.toLinkedSet(credentialsSupport.values())));`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`	`}`