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 11fa75d0f7 OAK-11562 : removed usage of Guava's Iterables.addAll
(#2149)
11fa75d0f7 is described below
commit 11fa75d0f7d080374ae9304c7034fefe16e6d9a8
Author: Rishabh Kumar <[email protected]>
AuthorDate: Fri Mar 7 17:41:35 2025 +0530
OAK-11562 : removed usage of Guava's Iterables.addAll (#2149)
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../spi/security/authorization/cug/impl/CugAccessControlManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
index 96bcf54137..75ae64237d 100644
---
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
@@ -369,7 +369,7 @@ class CugAccessControlManager extends
AbstractAccessControlManager implements Cu
String path = eval.remove();
Tree t = immutableRoot.getTree(path);
if (PathUtils.denotesRoot(path)) {
- Iterables.addAll(eval, nestedCugPaths(t));
+ nestedCugPaths(t).forEach(eval::add);
}
if (CugUtil.isSupportedPath(path, supportedPaths)) {
Tree cug = CugUtil.getCug(t);
@@ -378,7 +378,7 @@ class CugAccessControlManager extends
AbstractAccessControlManager implements Cu
if
(!Collections.disjoint(ImmutableSet.copyOf(principalNames),
ImmutableSet.copyOf(pNames.getValue(Type.STRINGS)))) {
candidates.add(path);
}
- Iterables.addAll(eval, nestedCugPaths(cug));
+ nestedCugPaths(cug).forEach(eval::add);
}
}
}