This is an automated email from the ASF dual-hosted git repository.
reschke 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 2fae6c2105 OAK-11470: Undo changes to remove usage of Guava
ImmutableSet - restore changes in test classes
2fae6c2105 is described below
commit 2fae6c2105f4194013c4df33311ecbb7891cb91a
Author: Julian Reschke <[email protected]>
AuthorDate: Sat Feb 8 10:10:00 2025 +0100
OAK-11470: Undo changes to remove usage of Guava ImmutableSet - restore
changes in test classes
---
.../external/basic/DefaultSyncConfigTest.java | 8 ++++----
.../external/impl/jmx/SyncMBeanImplTest.java | 5 ++---
.../impl/principal/AutoMembershipPrincipalsTest.java | 3 +--
.../impl/principal/SystemPrincipalConfigTest.java | 4 +---
.../authorization/cug/impl/CugTreePermissionTest.java | 5 +++--
.../security/authorization/cug/impl/MoveRenameTest.java | 4 ++--
.../principalbased/impl/AbstractEntryTest.java | 4 ++--
.../impl/PolicyValidatorLimitedUserTest.java | 3 +--
.../impl/ReadablePathsAccessControlTest.java | 3 +--
.../azure/blobstorage/AzureBlobStoreBackendTest.java | 8 +++++---
.../authentication/Jackrabbit2ConfigurationTest.java | 5 ++---
.../authentication/user/LoginModuleImplTest.java | 5 +++--
.../security/authorization/accesscontrol/EntryTest.java | 7 +++----
.../authorization/evaluation/RepoLevelPolicyTest.java | 5 ++---
.../restriction/AbstractRestrictionProviderTest.java | 3 +--
.../security/principal/PrincipalProviderImplTest.java | 5 +----
.../privilege/PrivilegeConfigurationImplTest.java | 5 ++---
.../oak/security/user/AddMembersByIdIgnoreTest.java | 3 +--
.../oak/security/user/ImpersonationImplEmptyTest.java | 3 +--
.../security/user/RemoveMembersByIdBestEffortTest.java | 3 +--
.../oak/security/user/RemoveMembersByIdIgnoreTest.java | 3 +--
.../security/user/RepMembersConflictHandlerTest.java | 1 -
.../principalbased/AbstractPrincipalBasedTest.java | 5 ++---
.../security/privilege/L7_PrivilegeDiscoveryTest.java | 17 ++++++++---------
.../JackrabbitAccessControlManagerTest.java | 5 ++---
.../security/privilege/PrivilegeRegistrationTest.java | 3 +--
.../authentication/AbstractLoginModuleTest.java | 15 ++++++++-------
.../OpenAuthorizationConfigurationTest.java | 5 ++---
.../accesscontrol/AbstractAccessControlTest.java | 3 +--
.../oak/segment/azure/AzureSegmentStoreServiceTest.java | 8 +++++---
30 files changed, 69 insertions(+), 87 deletions(-)
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
index 2cc06dd4af..6f4e295d28 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
@@ -17,10 +17,10 @@
package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.jetbrains.annotations.NotNull;
@@ -158,9 +158,9 @@ public class DefaultSyncConfigTest {
// only global ids for getAutoMembership(Authorizable) as no specific
config for 'gr'
assertEquals(globalGroupIds, dscA.getAutoMembership(gr));
// for 'user' the combine set of global and conditional config is
returned
- Set<String> expected = ImmutableSet.<String>builder()
- .addAll(globalGroupIds)
- .addAll(configGroupIds).build();
+ Set<String> expected = new HashSet<>();
+ expected.addAll(globalGroupIds);
+ expected.addAll(configGroupIds);
assertEquals(expected, dscA.getAutoMembership(user));
}
}
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
index 29c35dc476..3eda03bb4c 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -637,7 +636,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
result = syncMBean.listOrphanedUsers();
assertEquals(2, result.length);
- assertEquals(Set.of("thirdUser", "g"), ImmutableSet.copyOf(result));
+ assertEquals(Set.of("thirdUser", "g"), Set.of(result));
}
@Test
@@ -669,7 +668,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
result = createThrowingSyncMBean(true).listOrphanedUsers();
assertEquals(2, result.length);
- assertEquals(Set.of("thirdUser", "g"), ImmutableSet.copyOf(result));
+ assertEquals(Set.of("thirdUser", "g"), Set.of(result));
}
@Test
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
index 04ea28f2e5..6da36512bc 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
@@ -16,7 +16,6 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -117,7 +116,7 @@ public class AutoMembershipPrincipalsTest extends
AbstractAutoMembershipTest {
public void testGetPrincipalsMixed() throws Exception {
Collection<Principal> principals = getAutoMembership(IDP_MIXED_AM,
authorizable, false);
assertFalse(principals.isEmpty());
- assertEquals(Set.of(automembershipGroup1.getPrincipal()),
ImmutableSet.copyOf(principals));
+ assertEquals(Set.of(automembershipGroup1.getPrincipal()),
Set.copyOf(principals));
verifyNoInteractions(authorizable, amConfig);
}
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
index 34e19cf954..0efea39c5a 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
@@ -16,9 +16,7 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.oak.spi.commit.MoveTracker;
import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider;
@@ -61,7 +59,7 @@ public class SystemPrincipalConfigTest extends
AbstractExternalAuthTest {
private SystemPrincipalConfig systemPrincipalConfig;
public SystemPrincipalConfigTest(String[] systemUserNames, String name) {
- this.systemUserNames = (systemUserNames == null) ? null :
ImmutableSet.copyOf(systemUserNames);
+ this.systemUserNames = (systemUserNames == null) ? null :
Set.of(systemUserNames);
}
@Parameterized.Parameters(name = "name={1}")
diff --git
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
index 96afce352d..f830bbdc0a 100644
---
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
+++
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
@@ -17,7 +17,8 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.security.Principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
+import java.util.Set;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -56,7 +57,7 @@ public class CugTreePermissionTest extends AbstractCugTest {
}
private CugTreePermission getCugTreePermission(@NotNull String path,
@NotNull Principal... principals) {
- CugPermissionProvider pp =
createCugPermissionProvider(ImmutableSet.copyOf(SUPPORTED_PATHS), principals);
+ CugPermissionProvider pp =
createCugPermissionProvider(Set.of(SUPPORTED_PATHS), principals);
TreePermission targetTp = getTreePermission(root, path, pp);
assertTrue(targetTp instanceof CugTreePermission);
return (CugTreePermission) targetTp;
diff --git
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/MoveRenameTest.java
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/MoveRenameTest.java
index d197a18991..86fca43095 100644
---
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/MoveRenameTest.java
+++
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/MoveRenameTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.jetbrains.annotations.NotNull;
@@ -29,6 +28,7 @@ import javax.jcr.Session;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import java.security.Principal;
+import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -68,7 +68,7 @@ public class MoveRenameTest extends AbstractCugTest {
}
private void assertCugPrivileges(@NotNull Principal principal, boolean
isGranted, String... paths) {
- CugPermissionProvider pp =
createCugPermissionProvider(ImmutableSet.copyOf(SUPPORTED_PATHS), principal);
+ CugPermissionProvider pp =
createCugPermissionProvider(Set.of(SUPPORTED_PATHS), principal);
for (String path : paths) {
assertEquals(isGranted, pp.isGranted(path, Session.ACTION_READ));
}
diff --git
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntryTest.java
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntryTest.java
index c7daf722bd..b8979808fd 100644
---
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntryTest.java
+++
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntryTest.java
@@ -16,7 +16,6 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import
org.apache.jackrabbit.oak.security.authorization.restriction.RestrictionProviderImpl;
@@ -37,6 +36,7 @@ import javax.jcr.ValueFactory;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.Privilege;
import java.security.Principal;
+import java.util.Set;
import static
org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NT_OAK_UNSTRUCTURED;
import static
org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants.REP_GLOB;
@@ -129,7 +129,7 @@ public class AbstractEntryTest extends
AbstractPrincipalBasedTest {
private final class TestEntry extends AbstractEntry {
TestEntry(@Nullable String oakPath, @NotNull Principal principal,
@NotNull PrivilegeBits privilegeBits, @NotNull Restriction... restrictions)
throws AccessControlException {
- super(oakPath, principal, privilegeBits,
ImmutableSet.copyOf(restrictions), AbstractEntryTest.this.getNamePathMapper());
+ super(oakPath, principal, privilegeBits, Set.of(restrictions),
AbstractEntryTest.this.getNamePathMapper());
}
TestEntry(@NotNull AbstractEntry base) throws AccessControlException {
diff --git
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PolicyValidatorLimitedUserTest.java
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PolicyValidatorLimitedUserTest.java
index 257e67b2c8..bcdced199d 100644
---
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PolicyValidatorLimitedUserTest.java
+++
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PolicyValidatorLimitedUserTest.java
@@ -16,7 +16,6 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -94,7 +93,7 @@ public class PolicyValidatorLimitedUserTest extends
AbstractPrincipalBasedTest {
policy.setProperty(REP_PRINCIPAL_NAME,
getTestSystemUser().getPrincipal().getName());
Tree entry = TreeUtil.addChild(policy, "entry",
NT_REP_PRINCIPAL_ENTRY);
entry.setProperty(REP_EFFECTIVE_PATH, effectiveOakPath, Type.PATH);
- entry.setProperty(REP_PRIVILEGES, ImmutableSet.copyOf(privNames),
Type.NAMES);
+ entry.setProperty(REP_PRIVILEGES, Set.of(privNames), Type.NAMES);
return entry;
}
diff --git
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
index f9683b6206..47aa1bfca0 100644
---
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
+++
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
@@ -16,7 +16,6 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.JcrConstants;
@@ -204,7 +203,7 @@ public class ReadablePathsAccessControlTest extends
AbstractPrincipalBasedTest {
// test-session can read-ac at readable path but cannot access
principal-based policy
try (ContentSession cs =
Java23Subject.doAsPrivileged(getTestSubject(),
(PrivilegedExceptionAction<ContentSession>) () ->
getContentRepository().login(null, null), null)) {
PrincipalBasedAccessControlManager testAcMgr = new
PrincipalBasedAccessControlManager(getMgrProvider(cs.getLatestRoot()),
getFilterProvider());
- Set<AccessControlPolicy> effective =
ImmutableSet.copyOf(testAcMgr.getEffectivePolicies(path));
+ Set<AccessControlPolicy> effective =
Set.of(testAcMgr.getEffectivePolicies(path));
assertEquals(1, effective.size());
assertTrue(effective.contains(ReadPolicy.INSTANCE));
diff --git
a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
index 41acca8800..788ca33e9e 100644
---
a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
+++
b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
@@ -24,7 +24,6 @@ import
com.microsoft.azure.storage.blob.SharedAccessBlobPermissions;
import com.microsoft.azure.storage.blob.SharedAccessBlobPolicy;
import org.apache.jackrabbit.core.data.DataRecord;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.ClassRule;
@@ -38,6 +37,8 @@ import java.util.Date;
import java.util.EnumSet;
import java.util.Properties;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import static com.microsoft.azure.storage.blob.SharedAccessBlobPermissions.ADD;
@@ -99,7 +100,8 @@ public class AzureBlobStoreBackendTest {
azureBlobStoreBackend.init();
assertWriteAccessGranted(azureBlobStoreBackend, "file");
- assertReadAccessGranted(azureBlobStoreBackend, concat(BLOBS, "file"));
+ assertReadAccessGranted(azureBlobStoreBackend,
+ concat(BLOBS, "file"));
}
@Test
@@ -290,7 +292,7 @@ public class AzureBlobStoreBackendTest {
}
private static Set<String> concat(Set<String> set, String element) {
- return ImmutableSet.<String>builder().addAll(set).add(element).build();
+ return Stream.concat(set.stream(),
Stream.of(element)).collect(Collectors.toSet());
}
private static String getConnectionString() {
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
index 38ab5410d7..345232b864 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/Jackrabbit2ConfigurationTest.java
@@ -24,7 +24,6 @@ import javax.jcr.SimpleCredentials;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginException;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import
org.apache.jackrabbit.api.security.authentication.token.TokenCredentials;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
@@ -244,7 +243,7 @@ public class Jackrabbit2ConfigurationTest extends
AbstractSecurityTest {
cs = login(sc);
AuthInfo ai = cs.getAuthInfo();
- Set<String> attrNames =
ImmutableSet.copyOf(ai.getAttributeNames());
+ Set<String> attrNames = Set.of(ai.getAttributeNames());
assertTrue(attrNames.contains("attr"));
assertFalse(attrNames.contains(".token"));
assertFalse(attrNames.contains(".token.mandatory"));
@@ -268,7 +267,7 @@ public class Jackrabbit2ConfigurationTest extends
AbstractSecurityTest {
cs = login(ic);
AuthInfo ai = cs.getAuthInfo();
- Set<String> attrNames =
ImmutableSet.copyOf(ai.getAttributeNames());
+ Set<String> attrNames = Set.of(ai.getAttributeNames());
assertTrue(attrNames.contains("attr"));
assertFalse(attrNames.contains(".token"));
assertFalse(attrNames.contains(".token.mandatory"));
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
index 504f891cbf..076ef15f63 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImplTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication.user;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -72,6 +71,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static
org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule.SHARED_KEY_CREDENTIALS;
import static
org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule.SHARED_KEY_PRE_AUTH_LOGIN;
@@ -376,7 +377,7 @@ public class LoginModuleImplTest extends
AbstractSecurityTest {
assertTrue(lm.commit());
// verify subject has been updated with test-user principals
- Set<Principal> expected = new
ImmutableSet.Builder().add(foreignPrincipal).addAll(principals).build();
+ Set<Principal> expected = Stream.concat(Stream.of(foreignPrincipal),
principals.stream()).collect(Collectors.toSet());
assertEquals(expected, subject.getPrincipals());
// no other public credentials than the AuthInfo
assertEquals(1, subject.getPublicCredentials().size());
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EntryTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EntryTest.java
index bddd70eed5..e5bbeddb92 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EntryTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EntryTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
import org.apache.jackrabbit.api.security.authorization.PrivilegeCollection;
import
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
@@ -166,7 +165,7 @@ public class EntryTest extends AbstractAccessControlTest {
Privilege[] expected = AccessControlUtils.privilegesFromNames(acMgr,
PrivilegeConstants.JCR_ADD_CHILD_NODES,
PrivilegeConstants.JCR_REMOVE_CHILD_NODES);
- assertEquals(ImmutableSet.copyOf(expected),
ImmutableSet.copyOf(privs));
+ assertEquals(Set.of(expected), Set.of(privs));
}
@Test
@@ -389,8 +388,8 @@ public class EntryTest extends AbstractAccessControlTest {
@Test
public void testGetPrivilegeCollection() throws Exception {
PrivilegeCollection pc = createEntry(Privilege.JCR_READ,
Privilege.JCR_WRITE).getPrivilegeCollection();
- Set<Privilege> expected =
ImmutableSet.copyOf(AccessControlUtils.privilegesFromNames(acMgr,
Privilege.JCR_READ, Privilege.JCR_WRITE));
- assertEquals(expected, ImmutableSet.copyOf(pc.getPrivileges()));
+ Set<Privilege> expected =
Set.of(AccessControlUtils.privilegesFromNames(acMgr, Privilege.JCR_READ,
Privilege.JCR_WRITE));
+ assertEquals(expected, Set.of(pc.getPrivileges()));
assertEquals(pc, createEntry(JCR_READ,
JCR_WRITE).getPrivilegeCollection());
assertEquals(pc, createEntry(JCR_READ,
PrivilegeConstants.JCR_ADD_CHILD_NODES,
PrivilegeConstants.JCR_MODIFY_PROPERTIES,
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/RepoLevelPolicyTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/RepoLevelPolicyTest.java
index e866b4c3a9..d16be3a76a 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/RepoLevelPolicyTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/RepoLevelPolicyTest.java
@@ -22,7 +22,6 @@ import javax.jcr.PathNotFoundException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
@@ -119,9 +118,9 @@ public class RepoLevelPolicyTest extends
AbstractOakCoreTest implements Privileg
public void testGetPrivileges() throws Exception {
setupPermission(null, getTestUser().getPrincipal(), true,
JCR_READ_ACCESS_CONTROL, JCR_NAMESPACE_MANAGEMENT);
- Set<Privilege> expected =
ImmutableSet.copyOf(privilegesFromNames(JCR_READ_ACCESS_CONTROL,
JCR_NAMESPACE_MANAGEMENT));
+ Set<Privilege> expected =
Set.of(privilegesFromNames(JCR_READ_ACCESS_CONTROL, JCR_NAMESPACE_MANAGEMENT));
AccessControlManager testAcMgr =
getAccessControlManager(getTestRoot());
- assertEquals(expected,
ImmutableSet.copyOf(testAcMgr.getPrivileges(null)));
+ assertEquals(expected, Set.of(testAcMgr.getPrivileges(null)));
}
}
\ No newline at end of file
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java
index 7601461a0b..7558c2e14b 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java
@@ -23,7 +23,6 @@ import javax.jcr.Value;
import javax.jcr.ValueFactory;
import javax.jcr.security.AccessControlException;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -94,7 +93,7 @@ public class AbstractRestrictionProviderTest extends
AbstractSecurityTest implem
Tree tmp = TreeUtil.addChild(rootNode, "testRoot",
JcrConstants.NT_UNSTRUCTURED);
Tree policy = TreeUtil.addChild(tmp, REP_POLICY, NT_REP_ACL);
Tree ace = TreeUtil.addChild(policy, "ace0", NT_REP_GRANT_ACE);
- restrictionProvider.writeRestrictions(tmp.getPath(), ace,
ImmutableSet.copyOf(restrictions));
+ restrictionProvider.writeRestrictions(tmp.getPath(), ace,
Set.of(restrictions));
return ace;
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
index 2e5ad92e9f..54cba9ac03 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
@@ -23,10 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -79,7 +76,7 @@ public class PrincipalProviderImplTest extends
AbstractPrincipalProviderTest {
root.commit();
Principal ep =
principalProvider.getPrincipal(EveryonePrincipal.NAME);
- Set<? extends Principal> everyoneMembers =
ImmutableSet.copyOf(Collections.list(((GroupPrincipal) ep).members()));
+ Set<? extends Principal> everyoneMembers =
Set.copyOf(Collections.list(((GroupPrincipal) ep).members()));
Iterator<? extends Principal> all =
principalProvider.findPrincipals(PrincipalManager.SEARCH_TYPE_ALL);
while (all.hasNext()) {
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImplTest.java
index 2a64b88e0c..92eb28ff05 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeConfigurationImplTest.java
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.security.privilege;
-import java.security.Principal;
import java.util.List;
+import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -72,7 +71,7 @@ public class PrivilegeConfigurationImplTest {
@Test
public void testGetValidators() {
- List<? extends ValidatorProvider> l =
configuration.getValidators("wspName", ImmutableSet.<Principal>of(), new
MoveTracker());
+ List<? extends ValidatorProvider> l =
configuration.getValidators("wspName", Set.of(), new MoveTracker());
assertEquals(1, l.size());
assertTrue(l.get(0) instanceof PrivilegeValidatorProvider);
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AddMembersByIdIgnoreTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AddMembersByIdIgnoreTest.java
index fcce1a541c..6bc4f44e5e 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AddMembersByIdIgnoreTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AddMembersByIdIgnoreTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
@@ -41,7 +40,7 @@ public class AddMembersByIdIgnoreTest extends
AbstractAddMembersByIdTest {
@Test
public void testNonExistingMember() throws Exception {
Set<String> failed = addNonExistingMember();
- assertEquals(ImmutableSet.copyOf(NON_EXISTING_IDS), failed);
+ assertEquals(Set.of(NON_EXISTING_IDS), failed);
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplEmptyTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplEmptyTest.java
index d8ee65e2da..b87d8d41dd 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplEmptyTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplEmptyTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -95,7 +94,7 @@ public class ImpersonationImplEmptyTest extends
AbstractSecurityTest {
@NotNull
static Subject createSubject(@NotNull Principal... principals) {
- return new Subject(true, ImmutableSet.copyOf(principals), Set.of(),
Set.of());
+ return new Subject(true, Set.of(principals), Set.of(), Set.of());
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdBestEffortTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdBestEffortTest.java
index e0dfefd3cb..f517e4e45c 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdBestEffortTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdBestEffortTest.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.security.user;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
@@ -42,7 +41,7 @@ public class RemoveMembersByIdBestEffortTest extends
AbstractRemoveMembersByIdTe
@Test
public void testNonExistingMember() throws Exception {
Set<String> failed = removeNonExistingMember();
- assertEquals(ImmutableSet.copyOf(NON_EXISTING_IDS), failed);
+ assertEquals(Set.of(NON_EXISTING_IDS), failed);
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdIgnoreTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdIgnoreTest.java
index 0c5ef1b0d1..9eba0f3e7b 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdIgnoreTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RemoveMembersByIdIgnoreTest.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.security.user;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
@@ -41,7 +40,7 @@ public class RemoveMembersByIdIgnoreTest extends
AbstractRemoveMembersByIdTest {
@Test
public void testNonExistingMember() throws Exception {
Set<String> failed = removeNonExistingMember();
- assertEquals(ImmutableSet.copyOf(NON_EXISTING_IDS), failed);
+ assertEquals(Set.of(NON_EXISTING_IDS), failed);
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandlerTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandlerTest.java
index ab75b267b7..f473a376e3 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandlerTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandlerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
diff --git
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
index 0c6ed8a58c..5276820ba9 100644
---
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
+++
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
@@ -16,7 +16,6 @@
*/
package
org.apache.jackrabbit.oak.exercise.security.authorization.principalbased;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
@@ -160,14 +159,14 @@ abstract class AbstractPrincipalBasedTest extends
AbstractSecurityTest {
@Nullable
static PrincipalAccessControlList
getApplicablePrincipalAccessControlList(@NotNull JackrabbitAccessControlManager
acMgr, @NotNull Principal principal) throws Exception {
- Set<JackrabbitAccessControlPolicy> applicable =
ImmutableSet.copyOf(acMgr.getApplicablePolicies(principal));
+ Set<JackrabbitAccessControlPolicy> applicable =
Set.of(acMgr.getApplicablePolicies(principal));
PrincipalAccessControlList acl = (PrincipalAccessControlList)
Iterables.find(applicable, accessControlPolicy -> accessControlPolicy
instanceof PrincipalAccessControlList, null);
return acl;
}
@NotNull
ContentSession getTestSession(@NotNull Principal... principals) throws
Exception {
- Subject subject = new Subject(true, ImmutableSet.copyOf(principals),
Set.of(), Set.of());
+ Subject subject = new Subject(true, Set.of(principals), Set.of(),
Set.of());
return Java23Subject.doAsPrivileged(subject,
(PrivilegedExceptionAction<ContentSession>) () ->
getContentRepository().login(null, null), null);
}
}
\ No newline at end of file
diff --git
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L7_PrivilegeDiscoveryTest.java
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L7_PrivilegeDiscoveryTest.java
index 68776e651b..a26a37a1a2 100644
---
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L7_PrivilegeDiscoveryTest.java
+++
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L7_PrivilegeDiscoveryTest.java
@@ -26,7 +26,6 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -240,15 +239,15 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
Set<Privilege> expected = null; // EXERCISE
Privilege[] testRootPrivs = acMgr.getPrivileges(testRoot);
- assertEquals(expected, ImmutableSet.copyOf(testRootPrivs));
+ assertEquals(expected, Set.of(testRootPrivs));
expected = null; // EXERCISE
Privilege[] privs = acMgr.getPrivileges(testPath);
- assertEquals(expected, ImmutableSet.copyOf(privs));
+ assertEquals(expected, Set.of(privs));
expected = null; // EXERCISE
Privilege[] childPrivs = acMgr.getPrivileges(childPath);
- assertEquals(expected, ImmutableSet.copyOf(childPrivs));
+ assertEquals(expected, Set.of(childPrivs));
}
public void testGetPrivilegesForPrincipals() throws Exception {
@@ -264,7 +263,7 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
for (String path : expected.keySet()) {
Set<Privilege> expectedPrivs = expected.get(path);
Privilege[] privs = acMgr.getPrivileges(path, principals);
- assertEquals(expectedPrivs, ImmutableSet.copyOf(privs));
+ assertEquals(expectedPrivs, Set.of(privs));
}
// 2. EXERCISE: expected privileges for the 'gPrincipal' only
@@ -277,7 +276,7 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
for (String path : expected.keySet()) {
Set<Privilege> expectedPrivs = expected.get(path);
Privilege[] privs = acMgr.getPrivileges(path, principals);
- assertEquals(expectedPrivs, ImmutableSet.copyOf(privs));
+ assertEquals(expectedPrivs, Set.of(privs));
}
// 3. EXERCISE: expected privileges for the 'uPrincipal' and
'gPrincipal'
@@ -290,7 +289,7 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
for (String path : expected.keySet()) {
Set<Privilege> expectedPrivs = expected.get(path);
Privilege[] privs = acMgr.getPrivileges(path, principals);
- assertEquals(expectedPrivs, ImmutableSet.copyOf(privs));
+ assertEquals(expectedPrivs, Set.of(privs));
}
// 4. EXERCISE: expected privileges for the 'uPrincipal', 'gPrincipal'
+ everyone
@@ -303,7 +302,7 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
for (String path : expected.keySet()) {
Set<Privilege> expectedPrivs = expected.get(path);
Privilege[] privs = acMgr.getPrivileges(path, principals);
- assertEquals(expectedPrivs, ImmutableSet.copyOf(privs));
+ assertEquals(expectedPrivs, Set.of(privs));
}
}
@@ -314,7 +313,7 @@ public class L7_PrivilegeDiscoveryTest extends
AbstractJCRTest {
Privilege[] privs = acMgr.getPrivileges(testPath, Set.of(gPrincipal));
Set<Privilege> expectedPrivs = null;
- assertEquals(expectedPrivs, ImmutableSet.copyOf(privs));
+ assertEquals(expectedPrivs, Set.of(privs));
}
public void testHasPermissionVsHasPrivilege() throws Exception {
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlManagerTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlManagerTest.java
index d1005470b7..f617c752a6 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlManagerTest.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlManagerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.jcr.security.authorization;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.authorization.PrivilegeCollection;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
@@ -95,8 +94,8 @@ public class JackrabbitAccessControlManagerTest extends
AbstractEvaluationTest {
PrivilegeCollection pc =
jrAcMgr.privilegeCollectionFromNames(Privilege.JCR_READ, Privilege.JCR_WRITE);
assertFalse(pc instanceof PrivilegeCollection.Default);
- Set<Privilege> expected = ImmutableSet.copyOf(privilegesFromNames(new
String[] {Privilege.JCR_READ, Privilege.JCR_WRITE}));
- assertEquals(expected, ImmutableSet.copyOf(pc.getPrivileges()));
+ Set<Privilege> expected = Set.of(privilegesFromNames(new String[]
{Privilege.JCR_READ, Privilege.JCR_WRITE}));
+ assertEquals(expected, Set.of(pc.getPrivileges()));
}
public void testPrivilegeCollectionFromInvalidNames() throws Exception {
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeRegistrationTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeRegistrationTest.java
index 0a08f93783..77957a8bad 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeRegistrationTest.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeRegistrationTest.java
@@ -34,7 +34,6 @@ import javax.jcr.Workspace;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
@@ -431,7 +430,7 @@ public class PrivilegeRegistrationTest extends
AbstractPrivilegeTest {
JackrabbitAccessControlManager acMgr =
(JackrabbitAccessControlManager) session.getAccessControlManager();
Privilege[] allPrivileges =
AccessControlUtils.privilegesFromNames(session, Privilege.JCR_ALL);
- Set<Principal> principalSet =
ImmutableSet.<Principal>of(EveryonePrincipal.getInstance());
+ Set<Principal> principalSet = Set.of(EveryonePrincipal.getInstance());
assertTrue(acMgr.hasPrivileges(testPath, principalSet, allPrivileges));
diff --git
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
index 98646e9ebd..f8677cd240 100644
---
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
+++
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import
org.apache.jackrabbit.api.security.authentication.token.TokenCredentials;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -63,6 +62,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static
org.apache.jackrabbit.oak.spi.security.authentication.AbstractLoginModule.SHARED_KEY_CREDENTIALS;
import static org.junit.Assert.assertEquals;
@@ -146,7 +147,7 @@ public class AbstractLoginModuleTest {
@Test
public void testLogoutSuccessClearsSubject() throws Exception {
- Subject subject = new Subject(false, ImmutableSet.<Principal>of(new
PrincipalImpl("pName")), Set.of(new TestCredentials()), Set.of());
+ Subject subject = new Subject(false, Set.of(new
PrincipalImpl("pName")), Set.of(new TestCredentials()), Set.of());
AbstractLoginModule loginModule = initLoginModule(subject);
assertTrue(loginModule.logout());
@@ -157,7 +158,7 @@ public class AbstractLoginModuleTest {
@Test
public void testLogoutSuccessReadOnlySubject() throws Exception {
- Subject subject = new Subject(true, ImmutableSet.<Principal>of(new
PrincipalImpl("pName")), Set.of(new TestCredentials()), Set.of());
+ Subject subject = new Subject(true, Set.of(new
PrincipalImpl("pName")), Set.of(new TestCredentials()), Set.of());
AbstractLoginModule loginModule = initLoginModule(subject);
assertTrue(loginModule.logout());
@@ -168,14 +169,14 @@ public class AbstractLoginModuleTest {
@Test
public void testLogoutSubjectWithoutCredentials() throws Exception {
- Subject subject = new Subject(false, ImmutableSet.<Principal>of(new
PrincipalImpl("pName")), Set.of("stringNotCredentials"), Set.of());
+ Subject subject = new Subject(false, Set.of(new
PrincipalImpl("pName")), Set.of("stringNotCredentials"), Set.of());
AbstractLoginModule loginModule = initLoginModule(subject);
loginModule.logout();
assertFalse(subject.getPublicCredentials().isEmpty());
assertFalse(subject.getPrincipals().isEmpty());
- subject = new Subject(false, ImmutableSet.<Principal>of(new
PrincipalImpl("pName")), Set.of(), Set.of());
+ subject = new Subject(false, Set.of(new PrincipalImpl("pName")),
Set.of(), Set.of());
loginModule = initLoginModule(subject);
loginModule.logout();
@@ -208,7 +209,7 @@ public class AbstractLoginModuleTest {
String userId = TestPrincipalProvider.getIDFromPrincipal(p);
Set<? extends Principal> principals = pp.getPrincipals(userId);
- Set<Principal> all =
ImmutableSet.<Principal>builder().add(p).add(foreignPrincipal).addAll(principals).build();
+ Set<Principal> all = Stream.concat(Stream.of(p, foreignPrincipal),
principals.stream()).collect(Collectors.toUnmodifiableSet());
AuthInfo authInfo = new AuthInfoImpl(userId, null, all);
@@ -242,7 +243,7 @@ public class AbstractLoginModuleTest {
Credentials foreign2 = new TokenCredentials("token");
Subject subject = new Subject(true,
- ImmutableSet.<Principal>of(new PrincipalImpl("pName")),
+ Set.of(new PrincipalImpl("pName")),
Set.of(creds, foreign1, foreign2), Set.of());
AbstractLoginModule loginModule = initLoginModule(subject);
diff --git
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfigurationTest.java
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfigurationTest.java
index 741b24a75c..bf43d7cc67 100644
---
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfigurationTest.java
+++
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/OpenAuthorizationConfigurationTest.java
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization;
-import java.security.Principal;
+import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.OpenPermissionProvider;
@@ -43,6 +42,6 @@ public class OpenAuthorizationConfigurationTest {
@Test
public void testGetPermissionProvider() {
- assertSame(OpenPermissionProvider.getInstance(),
config.getPermissionProvider(Mockito.mock(Root.class), "default",
ImmutableSet.<Principal>of()));
+ assertSame(OpenPermissionProvider.getInstance(),
config.getPermissionProvider(Mockito.mock(Root.class), "default", Set.of()));
}
}
\ No newline at end of file
diff --git
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlTest.java
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlTest.java
index 2f4793bcc3..5fb9bbdc4a 100644
---
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlTest.java
+++
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
@@ -62,7 +61,7 @@ public abstract class AbstractAccessControlTest {
ACE createEntry(Principal principal, PrivilegeBits privilegeBits, boolean
isAllow, Restriction... restrictions)
throws RepositoryException {
- return new TestACE(principal, privilegeBits, isAllow,
ImmutableSet.copyOf(restrictions));
+ return new TestACE(principal, privilegeBits, isAllow,
Set.of(restrictions));
}
private final class TestACE extends ACE {
diff --git
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java
index a4531c3b5c..8a9b35faed 100644
---
a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java
+++
b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreServiceTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.jackrabbit.oak.segment.azure;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import com.microsoft.azure.storage.StorageException;
-import com.microsoft.azure.storage.blob.*;
+import com.microsoft.azure.storage.blob.SharedAccessBlobPermissions;
+import com.microsoft.azure.storage.blob.SharedAccessBlobPolicy;
+import com.microsoft.azure.storage.blob.CloudBlobContainer;
import java.io.IOException;
import java.net.URISyntaxException;
import java.time.Duration;
@@ -27,6 +28,7 @@ import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Set;
+import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import
org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzuriteDockerRule;
@@ -243,7 +245,7 @@ public class AzureSegmentStoreServiceTest {
}
private static Set<String> concat(Set<String> blobs, String element) {
- return
ImmutableSet.<String>builder().addAll(blobs).add(element).build();
+ return Stream.concat(blobs.stream(),
Stream.of(element)).collect(toSet());
}
private static Configuration
getConfigurationWithSharedAccessSignature(String sasToken) {
