OAK-11513 : removed usage of Guava's Iterables.toArray (#2107)

Co-authored-by: Rishabh Kumar <diam@adobe.com>

Author: rishabhdaim

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorProvider.java

@@ -23,6 +23,7 @@
 import org.apache.jackrabbit.oak.api.Tree;
 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.plugins.tree.RootProvider;
 import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
@@ -78,7 +79,7 @@ class DynamicGroupValidatorProvider extends ValidatorProvider implements Externa
         this.rootBefore = rootProvider.createReadOnlyRoot(before);
         this.rootAfter = rootProvider.createReadOnlyRoot(after);
 
-        return new SubtreeValidator(new DynamicGroupValidator(), Iterables.toArray(PathUtils.elements(groupRootPath), String.class));
+        return new SubtreeValidator(new DynamicGroupValidator(), IterableUtils.toArray(PathUtils.elements(groupRootPath), String.class));
     }
 
     private class DynamicGroupValidator extends DefaultValidator {

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java

@@ -166,7 +166,7 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
         this.hasOnlyDynamicGroups = hasOnlyDynamicGroups;
 
         autoMembershipPrincipals = new AutoMembershipPrincipals(userManager, 
-                Collections.singletonMap(idpName, Iterables.toArray(IterableUtils.chainedIterable(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()), String.class)),
+                Collections.singletonMap(idpName, IterableUtils.toArray(IterableUtils.chainedIterable(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()), String.class)),
                 Collections.singletonMap(idpName, syncConfig.user().getAutoMembershipConfig()));
         groupAutoMembershipPrincipals = (idpNamesWithDynamicGroups.isEmpty()) ? null : 
                 new AutoMembershipPrincipals(userManager, 

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalUserValidatorProvider.java

@@ -22,6 +22,7 @@
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
 import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
 import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -84,7 +85,7 @@ class ExternalUserValidatorProvider extends ValidatorProvider implements Externa
     protected @NotNull Validator getRootValidator(NodeState before, NodeState after, CommitInfo info) {
         this.rootBefore = rootProvider.createReadOnlyRoot(before);
         this.rootAfter = rootProvider.createReadOnlyRoot(after);
-        return new SubtreeValidator(new ExternalUserValidator(), Iterables.toArray(PathUtils.elements(authorizableRootPath), String.class));
+        return new SubtreeValidator(new ExternalUserValidator(), IterableUtils.toArray(PathUtils.elements(authorizableRootPath), String.class));
     }
 
     private class ExternalUserValidator extends DefaultValidator {

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java

@@ -82,7 +82,7 @@ protected DefaultSyncConfig createSyncConfig() {
     }
 
     @NotNull String[] getAutoMembership() {
-        return Iterables.toArray(IterableUtils.chainedIterable(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()), String.class);
+        return IterableUtils.toArray(IterableUtils.chainedIterable(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()), String.class);
     }
 
     @NotNull AutoMembershipConfig getAutoMembershipConfig() {

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializerTest.java

@@ -19,6 +19,7 @@
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
 import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants;
@@ -64,7 +65,7 @@ private static void assertIndexDefinition(Tree tree, String propName, boolean is
         assertEquals(isUnique, TreeUtil.getBoolean(tree, IndexConstants.UNIQUE_PROPERTY_NAME));
         assertArrayEquals(
                 propName, new String[]{propName},
-                Iterables.toArray(TreeUtil.getStrings(tree, IndexConstants.PROPERTY_NAMES), String.class));
+                IterableUtils.toArray(TreeUtil.getStrings(tree, IndexConstants.PROPERTY_NAMES), String.class));
         Iterable<String> declaringNtNames = TreeUtil.getStrings(tree, IndexConstants.DECLARING_NODE_TYPES);
         assertNull(declaringNtNames);
     }

oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPaths.java

@@ -22,6 +22,7 @@
 import org.apache.jackrabbit.oak.api.Tree;
 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.util.Text;
 import org.jetbrains.annotations.NotNull;
 
@@ -85,7 +86,7 @@ private void computeCntAndPaths() {
             cnt = hiddenTopCnt.getValue(Type.LONG);
             if (cnt <= MAX_CNT) {
                 PropertyState hidden = root.getTree(PathUtils.ROOT_PATH).getProperty(HIDDEN_NESTED_CUGS);
-                paths = (hidden == null) ? new String[0] : Iterables.toArray(hidden.getValue(Type.STRINGS), String.class);
+                paths = (hidden == null) ? new String[0] : IterableUtils.toArray(hidden.getValue(Type.STRINGS), String.class);
             } else {
                 paths = new String[0];
             }

oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAccessControlManager.java

@@ -235,9 +235,9 @@ public AccessControlPolicy[] getEffectivePolicies(String absPath) throws Reposit
 
             if (ReadPolicy.hasEffectiveReadPolicy(readPaths, oakPath)) {
                 Iterable<AccessControlPolicy> iterable = IterableUtils.chainedIterable(acls, Collections.singleton(ReadPolicy.INSTANCE));
-                return Iterables.toArray(iterable, AccessControlPolicy.class);
+                return IterableUtils.toArray(iterable, AccessControlPolicy.class);
             } else {
-                return Iterables.toArray(acls, PrincipalAccessControlList.class);
+                return IterableUtils.toArray(acls, PrincipalAccessControlList.class);
             }
         } catch (ParseException e) {
             String msg = "Error while collecting effective policies at " +absPath;

oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporter.java

@@ -22,6 +22,7 @@
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.StringUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
 import org.apache.jackrabbit.oak.commons.conditions.Validate;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
@@ -308,7 +309,7 @@ private void applyTo(@NotNull PrincipalPolicyImpl policy) throws RepositoryExcep
                 log.error("Missing rep:effectivePath for entry {} of policy at {}", this, policy.getOakPath());
                 throw new ConstraintViolationException("Entries for PrincipalAccessControlList must specify an effective path.");
             }
-            policy.addEntry(StringUtils.emptyToNull(effectivePath), Iterables.toArray(privileges, Privilege.class), restrictions, mvRestrictions);
+            policy.addEntry(StringUtils.emptyToNull(effectivePath), IterableUtils.toArray(privileges, Privilege.class), restrictions, mvRestrictions);
         }
     }
 }

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java

@@ -23,6 +23,7 @@
 import org.apache.jackrabbit.oak.api.PropertyState;
 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.conditions.Validate;
 import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.index.IndexSelectionPolicy;
@@ -216,7 +217,7 @@ private static boolean isEnabled(NodeState definition, NodeState root) {
     private static String[] getOptionalStrings(NodeState defn, String propertyName) {
         PropertyState ps = defn.getProperty(propertyName);
         if (ps != null) {
-            return Iterables.toArray(ps.getValue(Type.STRINGS), String.class);
+            return IterableUtils.toArray(ps.getValue(Type.STRINGS), String.class);
         }
         return null;
     }

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexStats.java

@@ -42,6 +42,7 @@
 import org.apache.jackrabbit.oak.api.Tree;
 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.jmx.AnnotatedStandardMBean;
 import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
 import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
@@ -141,7 +142,7 @@ private CompositeData getStatsForIndex(String path, NodeState idx, int maxValueC
                     status = String.format("stats cannot be determined as number of values exceed the max limit of " +
                             "[%d]. Estimated value count [%d]", maxValueCount, childNodeCount);
                 } else {
-                    String[] values = Iterables.toArray(
+                    String[] values = IterableUtils.toArray(
                             Iterables.limit(data.getChildNodeNames(), maxValueCount),
                             String.class
                     );
@@ -199,7 +200,7 @@ public Iterable<Tree> children(@NotNull  Tree root) {
         }
 
         if (maxPathLimitBreachedAtLevel < 0) {
-            return Iterables.toArray(paths, String.class);
+            return IterableUtils.toArray(paths, String.class);
         }
 
         //If max limit for path is reached then we can safely
@@ -215,7 +216,7 @@ public Iterable<Tree> children(@NotNull  Tree root) {
                 }
             }
         }
-        return Iterables.toArray(result, String.class);
+        return IterableUtils.toArray(result, String.class);
     }
 
     @SuppressWarnings("unchecked")