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 2024/12/21 06:24:15 UTC

(jackrabbit-oak) 01/01: Merge pull request #1914 from apache/OAK-11317

This is an automated email from the ASF dual-hosted git repository.

daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit 81abf85d208cb43f1aeae72ba9e11c4da5bd48a1
Merge: 437375bdc9 47073558a4
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Sat Dec 21 11:54:08 2024 +0530

    Merge pull request #1914 from apache/OAK-11317
    
    OAK-11317 : removed usage of ImmutableSet from guava

 .../external/basic/DefaultSyncConfig.java          |  8 ++--
 .../impl/principal/AutoMembershipPrincipals.java   |  3 +-
 .../ExternalAuthorizableActionProvider.java        |  4 +-
 .../principal/ExternalGroupPrincipalProvider.java  |  4 +-
 .../impl/principal/ProtectionConfigImpl.java       |  6 +--
 .../external/TestIdentityProvider.java             |  3 +-
 .../external/basic/DefaultSyncConfigTest.java      |  8 ++--
 .../external/impl/jmx/SyncMBeanImplTest.java       |  5 +-
 .../principal/AutoMembershipPrincipalsTest.java    |  3 +-
 .../impl/principal/AutoMembershipProviderTest.java | 20 ++++----
 .../ExternalGroupPrincipalProviderTest.java        | 53 ++++++++++------------
 ...xternalGroupPrincipalProviderWithCacheTest.java |  8 +---
 .../PrincipalProviderAutoMembershipTest.java       | 13 +++---
 .../PrincipalProviderDeepNestingTest.java          |  7 ++-
 .../impl/principal/SyncConfigTrackerTest.java      |  9 ++--
 .../principal/SyncHandlerMappingTrackerTest.java   | 16 +++----
 .../impl/principal/SystemPrincipalConfigTest.java  |  4 +-
 .../ldap/impl/LdapIdentityProviderTest.java        | 16 +++----
 .../cug/impl/CugAccessControlManager.java          |  3 +-
 .../authorization/cug/impl/CugExcludeImpl.java     |  7 ++-
 .../authorization/cug/impl/AbstractCugTest.java    |  8 ++--
 .../cug/impl/CugAccessControlManagerTest.java      | 23 +++++-----
 .../cug/impl/CugConfigurationTest.java             |  3 +-
 .../authorization/cug/impl/CugEvaluationTest.java  |  3 +-
 .../authorization/cug/impl/CugImportBaseTest.java  |  4 +-
 .../cug/impl/CugTreePermissionTest.java            |  5 +-
 .../authorization/cug/impl/MoveRenameTest.java     |  4 +-
 .../principalbased/impl/AbstractEntryTest.java     |  4 +-
 .../impl/AbstractPrincipalBasedTest.java           | 10 ++--
 .../principalbased/impl/EffectivePolicyTest.java   |  4 +-
 .../impl/PolicyValidatorLimitedUserTest.java       |  3 +-
 .../PrincipalBasedAccessControlManagerTest.java    |  4 +-
 .../impl/ReadablePathsAccessControlTest.java       |  3 +-
 .../authorization/AbstractHasItemGetItemTest.java  |  3 +-
 .../blobstorage/AzureBlobStoreBackendTest.java     |  8 ++--
 .../oak/commons/collections/CollectionUtils.java   | 23 ++++++++--
 .../oak/commons/collections/package-info.java      |  2 +-
 .../commons/collections/CollectionUtilsTest.java   | 18 ++++++++
 .../apache/jackrabbit/oak/spi/mount/MountInfo.java |  3 +-
 .../jackrabbit/oak/spi/observation/ChangeSet.java  | 12 ++---
 .../oak/plugins/migration/NodeStateCopier.java     | 21 ++++-----
 .../token/TokenConfigurationImpl.java              |  4 +-
 .../composite/CompositeAccessControlManager.java   | 10 ++--
 .../authorization/restriction/CurrentPattern.java  |  8 ++--
 .../authorization/restriction/ItemNamePattern.java |  4 +-
 .../authorization/restriction/NodeTypePattern.java |  4 +-
 .../authorization/restriction/PrefixPattern.java   |  4 +-
 .../security/user/RepMembersConflictHandler.java   |  8 ++--
 .../index/AsyncIndexInfoServiceImplTest.java       |  9 ++--
 .../oak/plugins/index/AsyncIndexUpdateTest.java    | 10 ++--
 .../Jackrabbit2ConfigurationTest.java              |  5 +-
 .../authentication/user/LoginModuleImplTest.java   |  5 +-
 .../authorization/accesscontrol/ACLTest.java       |  3 +-
 .../AccessControlImporterBaseTest.java             |  7 ++-
 .../AccessControlManagerImplTest.java              |  7 ++-
 ...AccessControlManagerLimitedPermissionsTest.java |  5 +-
 .../authorization/accesscontrol/EntryTest.java     |  7 ++-
 .../composite/AbstractCompositeProviderTest.java   |  5 +-
 .../CompositeAccessControlManagerTest.java         |  9 ++--
 .../evaluation/RepoLevelPolicyTest.java            |  5 +-
 .../permission/PermissionHookTest.java             |  5 +-
 .../AbstractRestrictionProviderTest.java           |  3 +-
 .../CompositeRestrictionProviderTest.java          |  4 +-
 .../principal/PrincipalProviderImplTest.java       |  5 +-
 .../privilege/PrivilegeBitsProviderTest.java       | 12 ++---
 .../privilege/PrivilegeConfigurationImplTest.java  |  5 +-
 .../oak/security/privilege/PrivilegeImplTest.java  |  3 +-
 .../privilege/PrivilegeManagerImplTest.java        |  4 +-
 .../security/privilege/PrivilegeValidatorTest.java |  5 +-
 .../security/user/AddMembersByIdIgnoreTest.java    |  3 +-
 .../user/AuthorizablePropertiesImplTest.java       |  6 +--
 .../oak/security/user/EveryoneGroupTest.java       | 10 ++--
 .../security/user/ImpersonationImplEmptyTest.java  |  3 +-
 .../oak/security/user/ImpersonationImplTest.java   |  6 +--
 .../user/InheritedMembersIteratorTest.java         |  4 +-
 .../user/RemoveMembersByIdBestEffortTest.java      |  3 +-
 .../security/user/RemoveMembersByIdIgnoreTest.java |  3 +-
 .../user/RepMembersConflictHandlerTest.java        |  1 -
 .../UserImporterImpersonationBestEffortTest.java   |  6 +--
 .../user/UserImporterImpersonationIgnoreTest.java  |  4 +-
 .../user/UserImporterMembershipIgnoreTest.java     |  6 +--
 .../user/UserPrincipalProviderWithCacheTest.java   |  4 +-
 .../security/user/query/UserQueryManagerTest.java  |  5 +-
 .../security/authentication/externalloginmodule.md |  2 +-
 .../security/authentication/token/default.md       |  2 +-
 oak-doc/src/site/markdown/security/user/default.md |  2 +-
 .../authorization/models/simplifiedroles/Role.java | 10 ++--
 .../ThreeRolesPermissionProvider.java              |  6 +--
 .../principal/CustomPrincipalProvider.java         |  3 +-
 .../L5_CustomPermissionEvaluationTest.java         | 19 ++++----
 .../principalbased/AbstractPrincipalBasedTest.java |  5 +-
 .../privilege/L3_BuiltInPrivilegesTest.java        |  4 +-
 .../privilege/L7_PrivilegeDiscoveryTest.java       | 17 ++++---
 .../JackrabbitAccessControlManagerTest.java        |  5 +-
 .../privilege/PrivilegeRegistrationTest.java       |  3 +-
 .../user/GroupImportWithActionsBestEffortTest.java | 10 ++--
 .../security/user/GroupImportWithActionsTest.java  |  4 +-
 .../lucene/directory/CopyOnReadDirectory.java      |  4 +-
 .../index/lucene/directory/OakDirectory.java       |  5 +-
 .../property/UniquenessConstraintValidator.java    |  4 +-
 .../document/flatfile/PathElementComparator.java   |  4 +-
 .../oak/plugins/index/search/IndexDefinition.java  |  4 +-
 .../oak/spi/security/ConfigurationParameters.java  |  8 ++--
 .../authentication/AbstractLoginModule.java        |  7 ++-
 .../spi/security/authentication/AuthInfoImpl.java  |  4 +-
 .../credentials/SimpleCredentialsSupport.java      |  6 +--
 .../security/authorization/accesscontrol/ACE.java  |  3 +-
 .../restriction/AbstractRestrictionProvider.java   |  4 +-
 .../privilege/ImmutablePrivilegeDefinition.java    | 10 ++--
 .../security/privilege/PrivilegeBitsProvider.java  | 31 ++++++-------
 .../spi/security/CompositeConfigurationTest.java   |  5 +-
 .../spi/security/ConfigurationParametersTest.java  | 19 ++++----
 .../authentication/AbstractLoginModuleTest.java    | 15 +++---
 .../security/authentication/AuthInfoImplTest.java  |  3 +-
 .../OpenAuthorizationConfigurationTest.java        |  5 +-
 .../accesscontrol/AbstractAccessControlTest.java   |  3 +-
 .../authorization/permission/PermissionsTest.java  |  3 +-
 .../principal/CompositePrincipalProviderTest.java  |  4 +-
 .../principal/PrincipalManagerImplTest.java        |  4 +-
 .../security/principal/TestPrincipalProvider.java  |  7 +--
 .../privilege/PrivilegeBitsProviderTest.java       | 30 ++++++------
 .../azure/AzureSegmentStoreServiceTest.java        |  8 ++--
 .../oak/composite/CompositeNodeStore.java          |  3 +-
 .../oak/composite/CompositionContext.java          |  7 +--
 .../checks/NodeTypeMountedNodeStoreChecker.java    |  7 ++-
 .../it/BackwardCompatibleMountCompositeIT.java     |  5 +-
 .../oak/composite/it/MultiMountCompositeIT.java    |  5 +-
 .../oak/plugins/document/mongo/MongoStatus.java    |  7 +--
 .../oak/upgrade/RepositorySidegrade.java           | 16 +++----
 .../jackrabbit/oak/upgrade/RepositoryUpgrade.java  | 14 +++---
 130 files changed, 453 insertions(+), 500 deletions(-)