OAK-11424 : removed usage of Guava ObjectArrays

Author: Rishabh Kumar

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

@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
 
-import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
 import org.apache.jackrabbit.oak.osgi.OsgiUtil;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
@@ -111,7 +111,7 @@ Map<String, String[]> getAutoMembership() {
             String[] userAuthMembership = PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP), new String[0]);
             String[] groupAuthMembership = PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP), new String[0]);
 
-            populateMap(syncHandlerName, ObjectArrays.concat(userAuthMembership, groupAuthMembership, String.class), autoMembership);
+            populateMap(syncHandlerName, ArrayUtils.addAll(userAuthMembership, groupAuthMembership), autoMembership);
         }
         return autoMembership;
     }

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

@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
 
-import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipAware;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipConfig;
@@ -141,7 +141,7 @@ public void testGetAutoMembership() {
 
         Map<String,String[]> automembership = tracker.getAutoMembership();
         assertEquals(1, automembership.size());
-        Set<String> expected = Set.of(ObjectArrays.concat(uam, gam, String.class));
+        Set<String> expected = Set.of(ArrayUtils.addAll(uam, gam));
         assertEquals(expected, Set.of(automembership.get("idp")));
     }
 
@@ -201,7 +201,7 @@ public void testGetAutoMembershipMultipleHandlersAndIdps() {
 
         Map<String,String[]> automembership = tracker.getAutoMembership();
         assertEquals(2, automembership.size());
-        Set<String> expected = Set.of(ObjectArrays.concat(uam, gam, String.class));
+        Set<String> expected = Set.of(ArrayUtils.addAll(uam, gam));
         assertEquals(expected, Set.of(automembership.get("idp")));
         assertArrayEquals(uam, automembership.get("idp2"));
     }

oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java

@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
@@ -143,7 +143,7 @@ void setupContentTrees(@NotNull String ntName, @NotNull String... oakPaths) thro
 
     @NotNull
     PrincipalPolicyImpl getPrincipalPolicyImpl(@NotNull Principal testPrincipal, @NotNull JackrabbitAccessControlManager acMgr) throws Exception {
-        for (JackrabbitAccessControlPolicy policy : ObjectArrays.concat(acMgr.getApplicablePolicies(testPrincipal), acMgr.getPolicies(testPrincipal), JackrabbitAccessControlPolicy.class)) {
+        for (JackrabbitAccessControlPolicy policy : ArrayUtils.addAll(acMgr.getApplicablePolicies(testPrincipal), acMgr.getPolicies(testPrincipal))) {
             if (policy instanceof PrincipalPolicyImpl) {
                 return (PrincipalPolicyImpl) policy;
             }

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java

@@ -24,7 +24,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jackrabbit.api.JackrabbitSession;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -101,7 +101,7 @@ public void beforeSuite() throws Exception {
                 groupPaths.add(g.getPath());
 
                 if (nested) {
-                    g.addMembers(ObjectArrays.concat(idArray, GROUP + j));
+                    g.addMembers(ArrayUtils.add(idArray, GROUP + j));
                 } else {
                     g.addMembers(idArray);
                 }

oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java

@@ -18,8 +18,8 @@
  */
 package org.apache.jackrabbit.oak.spi.security;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.collections.SetUtils;
@@ -318,7 +318,7 @@ private void add(@NotNull SecurityConfiguration configuration) {
                             return;
                         }
                     }
-                    delegatees = ObjectArrays.concat(delegatees, c);
+                    delegatees = ArrayUtils.add(delegatees, c);
                 }
             }
         }