Skip to content

Commit e1d46ad

Browse files
mbaedkembaedke
authored
Merge branch 'trunk' into issue/oak-11423 
2 parents c93b1b7 + ed80d11 commit e1d46ad

File tree

90 files changed

+332
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+332
-319
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
1818

19-
import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
19+
import org.apache.commons.lang3.ArrayUtils;
2020
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
2121
import org.apache.jackrabbit.oak.osgi.OsgiUtil;
2222
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
@@ -111,7 +111,7 @@ Map<String, String[]> getAutoMembership() {
111111
String[] userAuthMembership = PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP), new String[0]);
112112
String[] groupAuthMembership = PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP), new String[0]);
113113

114-
populateMap(syncHandlerName, ObjectArrays.concat(userAuthMembership, groupAuthMembership, String.class), autoMembership);
114+
populateMap(syncHandlerName, ArrayUtils.addAll(userAuthMembership, groupAuthMembership), autoMembership);
115115
}
116116
return autoMembership;
117117
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.guava.common.collect.Iterators;
2122
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -657,7 +658,7 @@ public void testSyncMembershipWithForeignGroups() throws Exception {
657658
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
658659
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
659660

660-
assertEquals(Iterables.size(sameIdpGroups), extPrincipalNames.length);
661+
assertEquals(IterableUtils.size(sameIdpGroups), extPrincipalNames.length);
661662
for (Value v : extPrincipalNames) {
662663
assertNotEquals(foreignGroup.getPrincipalName(), v.getString());
663664
}
@@ -681,7 +682,7 @@ public void testSyncMembershipWithUserRef() throws Exception {
681682
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
682683
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
683684

684-
assertEquals(Iterables.size(groupRefs), extPrincipalNames.length);
685+
assertEquals(IterableUtils.size(groupRefs), extPrincipalNames.length);
685686
for (Value v : extPrincipalNames) {
686687
assertNotEquals(second.getPrincipalName(), v.getString());
687688
}
@@ -703,7 +704,7 @@ public void testSyncMembershipWithUserConflict() throws Exception {
703704
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
704705
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
705706

706-
assertEquals(Iterables.size(groupRefs), extPrincipalNames.length);
707+
assertEquals(IterableUtils.size(groupRefs), extPrincipalNames.length);
707708
for (Value v : extPrincipalNames) {
708709
assertNotEquals(previouslySyncedUser.getPrincipalName(), v.getString());
709710
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.api.security.user.UserManager;
2122
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -325,7 +326,7 @@ public void testGetProtectedItemImporters() {
325326
@Test
326327
public void testGetMonitors() {
327328
Iterable<Monitor<?>> monitors = externalPrincipalConfiguration.getMonitors(StatisticsProvider.NOOP);
328-
assertEquals(1, Iterables.size(monitors));
329+
assertEquals(1, IterableUtils.size(monitors));
329330
assertTrue(monitors.iterator().next() instanceof ExternalIdentityMonitorImpl);
330331
}
331332

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
1818

19-
import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
19+
import org.apache.commons.lang3.ArrayUtils;
2020
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
2121
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipAware;
2222
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipConfig;
@@ -141,7 +141,7 @@ public void testGetAutoMembership() {
141141

142142
Map<String,String[]> automembership = tracker.getAutoMembership();
143143
assertEquals(1, automembership.size());
144-
Set<String> expected = Set.of(ObjectArrays.concat(uam, gam, String.class));
144+
Set<String> expected = Set.of(ArrayUtils.addAll(uam, gam));
145145
assertEquals(expected, Set.of(automembership.get("idp")));
146146
}
147147

@@ -201,7 +201,7 @@ public void testGetAutoMembershipMultipleHandlersAndIdps() {
201201

202202
Map<String,String[]> automembership = tracker.getAutoMembership();
203203
assertEquals(2, automembership.size());
204-
Set<String> expected = Set.of(ObjectArrays.concat(uam, gam, String.class));
204+
Set<String> expected = Set.of(ArrayUtils.addAll(uam, gam));
205205
assertEquals(expected, Set.of(automembership.get("idp")));
206206
assertArrayEquals(uam, automembership.get("idp2"));
207207
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
1818

19-
import org.apache.jackrabbit.guava.common.collect.Iterables;
19+
import org.apache.commons.collections4.IterableUtils;
2020
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
2121
import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncHandlerMapping;
2222
import org.junit.Before;
@@ -49,21 +49,21 @@ public void before() {
4949
@Test
5050
public void testAddingServiceWithoutProperties() {
5151
tracker.addingService(ref);
52-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
52+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
5353
}
5454

5555
@Test
5656
public void testAddingServiceWithIdpProp() {
5757
when(ref.getProperty(PARAM_IDP_NAME)).thenReturn("testIDP");
5858
tracker.addingService(ref);
59-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
59+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
6060
}
6161

6262
@Test
6363
public void testAddingServiceWithSyncHandlerProp() {
6464
when(ref.getProperty(PARAM_SYNC_HANDLER_NAME)).thenReturn("testSH");
6565
tracker.addingService(ref);
66-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
66+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
6767
}
6868

6969
@Test
@@ -94,21 +94,21 @@ public void testAddingServiceWithProperties() {
9494
@Test
9595
public void testModifiedServiceWithoutProperties() {
9696
tracker.modifiedService(ref, service);
97-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
97+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
9898
}
9999

100100
@Test
101101
public void testModifiedServiceWithIdpProp() {
102102
when(ref.getProperty(PARAM_IDP_NAME)).thenReturn("testIDP");
103103
tracker.modifiedService(ref, service);
104-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
104+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
105105
}
106106

107107
@Test
108108
public void testModifiedServiceWithSyncHandlerProp() {
109109
when(ref.getProperty(PARAM_SYNC_HANDLER_NAME)).thenReturn("testSH");
110110
tracker.modifiedService(ref, service);
111-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
111+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
112112
}
113113

114114
@Test
@@ -126,7 +126,7 @@ public void testModifiedServiceWithProperties() {
126126
when(ref.getProperty(PARAM_SYNC_HANDLER_NAME)).thenReturn("testSH-3");
127127
when(ref.getProperty(PARAM_IDP_NAME)).thenReturn("testIDP-3");
128128
tracker.modifiedService(ref, service);
129-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
129+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
130130
assertEquals(Set.of("testIDP-3"), SetUtils.toSet(tracker.getIdpNames("testSH-3")));
131131
}
132132

@@ -138,6 +138,6 @@ public void testRemovedService() {
138138
tracker.addingService(ref);
139139
tracker.removedService(ref, service);
140140

141-
assertTrue(Iterables.isEmpty(tracker.getIdpNames("testSH")));
141+
assertTrue(IterableUtils.isEmpty(tracker.getIdpNames("testSH")));
142142
}
143143
}

‎oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProviderTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
1919

20+
import org.apache.commons.collections4.IterableUtils;
2021
import org.apache.jackrabbit.guava.common.collect.Iterables;
2122
import org.apache.jackrabbit.guava.common.collect.Iterators;
2223
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
@@ -211,7 +212,7 @@ public void testGetDeclaredMembersInvalidMemberAttribute() throws Exception {
211212

212213
ExternalGroup gr = idp.getGroup(TEST_GROUP1_NAME);
213214
Iterable<ExternalIdentityRef> memberrefs = gr.getDeclaredMembers();
214-
assertTrue(Iterables.isEmpty(memberrefs));
215+
assertTrue(IterableUtils.isEmpty(memberrefs));
215216
}
216217

217218
@Test

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.HashSet;
2121
import java.util.List;
2222
import java.util.Set;
23+
24+
import org.apache.commons.collections4.IterableUtils;
2325
import org.apache.jackrabbit.guava.common.collect.Iterables;
2426
import org.apache.jackrabbit.oak.api.PropertyState;
2527
import org.apache.jackrabbit.oak.api.Type;
@@ -294,7 +296,7 @@ public boolean childNodeDeleted(String name, NodeState before) {
294296
// are still present.
295297
Set<String> reconnect = getCugPathsToReconnect(before);
296298
if (isRoot) {
297-
if (!Iterables.isEmpty(reconnect)) {
299+
if (!IterableUtils.isEmpty(reconnect)) {
298300
afterBuilder.setProperty(HIDDEN_NESTED_CUGS, reconnect, Type.STRINGS);
299301
afterBuilder.setProperty(HIDDEN_TOP_CUG_CNT, reconnect.size());
300302
}

‎oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.api.security.authorization.PrincipalSetPolicy;
2122
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
@@ -109,7 +110,7 @@ public void testCreateWithDuplicateName() {
109110

110111
CugPolicyImpl cugPolicy = createCugPolicy(duplication);
111112
assertEquals(1, cugPolicy.getPrincipals().size());
112-
assertEquals(1, Iterables.size(cugPolicy.getPrincipalNames()));
113+
assertEquals(1, IterableUtils.size(cugPolicy.getPrincipalNames()));
113114
}
114115

115116
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
1818

19-
import org.apache.jackrabbit.guava.common.collect.Iterables;
19+
import org.apache.commons.collections4.IterableUtils;
2020
import org.apache.jackrabbit.JcrConstants;
2121
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
2222
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -221,7 +221,7 @@ private void validateEntry(@NotNull String name, @NotNull NodeState nodeState) t
221221
throw accessControlViolation(36, "Isolated entry of principal policy at " + entryPath);
222222
}
223223
Iterable<String> privilegeNames = nodeState.getNames(REP_PRIVILEGES);
224-
if (Iterables.isEmpty(privilegeNames)) {
224+
if (IterableUtils.isEmpty(privilegeNames)) {
225225
throw accessControlViolation(37, "Empty rep:privileges property at " + entryPath);
226226
}
227227
PrivilegeManager privilegeManager = mgrProvider.getPrivilegeManager();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
1818

19+
import org.apache.commons.lang3.ArrayUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
20-
import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
2121
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
2222
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
2323
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
@@ -143,7 +143,7 @@ void setupContentTrees(@NotNull String ntName, @NotNull String... oakPaths) thro
143143

144144
@NotNull
145145
PrincipalPolicyImpl getPrincipalPolicyImpl(@NotNull Principal testPrincipal, @NotNull JackrabbitAccessControlManager acMgr) throws Exception {
146-
for (JackrabbitAccessControlPolicy policy : ObjectArrays.concat(acMgr.getApplicablePolicies(testPrincipal), acMgr.getPolicies(testPrincipal), JackrabbitAccessControlPolicy.class)) {
146+
for (JackrabbitAccessControlPolicy policy : ArrayUtils.addAll(acMgr.getApplicablePolicies(testPrincipal), acMgr.getPolicies(testPrincipal))) {
147147
if (policy instanceof PrincipalPolicyImpl) {
148148
return (PrincipalPolicyImpl) policy;
149149
}

0 commit comments

Comments
 (0)