You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2025/01/23 07:19:27 UTC
(jackrabbit-oak) branch OAK-11424 created (now 28a39f3e49)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-11424
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 28a39f3e49 OAK-11424 : removed usage of Guava ObjectArrays
This branch includes the following new commits:
new 28a39f3e49 OAK-11424 : removed usage of Guava ObjectArrays
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11424 : removed usage of Guava ObjectArrays
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11424
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 28a39f3e49560ace8a1056a9d0f75cff0c7da397
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Thu Jan 23 12:49:13 2025 +0530
OAK-11424 : removed usage of Guava ObjectArrays
---
.../authentication/external/impl/principal/SyncConfigTracker.java | 4 ++--
.../external/impl/principal/SyncConfigTrackerTest.java | 6 +++---
.../principalbased/impl/AbstractPrincipalBasedTest.java | 4 ++--
.../java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java | 4 ++--
.../apache/jackrabbit/oak/spi/security/CompositeConfiguration.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTracker.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTracker.java
index a3d8921170..e7564725e2 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTracker.java
+++ b/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 @@ final class SyncConfigTracker extends ServiceTracker {
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;
}
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java
index a9369d7965..b8a6b44d52 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java
+++ b/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 class SyncConfigTrackerTest {
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 class SyncConfigTrackerTest {
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"));
}
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java
index 3e59a77ed4..04830425cd 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java
+++ b/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 @@ public abstract class AbstractPrincipalBasedTest extends AbstractSecurityTest {
@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;
}
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
index b600f893fc..577af56b68 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/MemberBaseTest.java
@@ -24,7 +24,7 @@ import javax.jcr.Repository;
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 @@ abstract class MemberBaseTest extends AbstractTest {
groupPaths.add(g.getPath());
if (nested) {
- g.addMembers(ObjectArrays.concat(idArray, GROUP + j));
+ g.addMembers(ArrayUtils.add(idArray, GROUP + j));
} else {
g.addMembers(idArray);
}
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
index 62ab5a8f24..6c09270611 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
+++ b/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 @@ public abstract class CompositeConfiguration<T extends SecurityConfiguration> im
return;
}
}
- delegatees = ObjectArrays.concat(delegatees, c);
+ delegatees = ArrayUtils.add(delegatees, c);
}
}
}