This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11546 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit f30e2295b2196c0f11ebf2be476598bd4695e668 Merge: d254e8f64d 77af802954 Author: Julian Reschke <[email protected]> AuthorDate: Fri Mar 14 09:14:02 2025 +0100 Merge branch 'trunk' into OAK-11571 .../external/impl/DynamicSyncContext.java | 1 - .../external/impl/ExternalLoginModule.java | 1 - .../principal/DynamicGroupValidatorProvider.java | 1 - .../principal/ExternalGroupPrincipalProvider.java | 1 - .../principal/ExternalUserValidatorProvider.java | 1 - .../impl/principal/SyncHandlerMappingTracker.java | 1 - .../external/basic/DefaultSyncContextTest.java | 1 - .../external/impl/AbstractDynamicTest.java | 1 - .../external/impl/DynamicSyncContextTest.java | 1 - .../external/impl/PrincipalResolutionTest.java | 1 - .../impl/principal/AbstractPrincipalTest.java | 1 - .../impl/principal/AutoMembershipProviderTest.java | 9 +- .../impl/principal/DynamicGroupValidatorTest.java | 6 +- .../ExternalGroupPrincipalProviderDMTest.java | 5 +- .../ExternalIdentityRepositoryInitializerTest.java | 1 - .../ExternalPrincipalConfigurationTest.java | 1 - .../ldap/impl/LdapIdentityProviderTest.java | 1 - .../cug/impl/CugAccessControlManager.java | 1 - .../authorization/cug/impl/NestedCugHook.java | 1 - .../authorization/cug/impl/TopLevelPaths.java | 1 - .../authorization/cug/impl/CugImportBaseTest.java | 1 - .../cug/impl/CugPermissionProviderTest.java | 1 - .../authorization/cug/impl/CugPolicyImplTest.java | 1 - .../authorization/cug/impl/NestedCugHookTest.java | 1 - .../authorization/cug/impl/VersionTest.java | 1 - .../impl/PrincipalBasedAccessControlManager.java | 1 - .../PrincipalBasedAuthorizationConfiguration.java | 1 - .../impl/PrincipalPolicyImporter.java | 1 - .../impl/AbstractPrincipalBasedTest.java | 1 - .../principalbased/impl/EffectivePolicyTest.java | 1 - .../impl/PermissionProviderVersionStoreTest.java | 1 - .../principalbased/impl/PolicyValidatorTest.java | 1 - .../impl/PrincipalPolicyImplTest.java | 1 - .../impl/ReadablePathsAccessControlTest.java | 1 - .../impl/ReadablePathsPermissionTest.java | 1 - .../impl/RepositoryPermissionTest.java | 1 - .../jackrabbit/oak/benchmark/HybridIndexTest.java | 3 +- .../principalbased/PrinicipalBasedReadTest.java | 1 - .../azure/blobstorage/AzureDataStoreTest.java | 4 +- .../oak/plugins/blob/CachingDataStoreTest.java | 9 +- .../oak/plugins/blob/SharedDataStoreUtilsTest.java | 1 - .../oak/plugins/blob/UploadStagingCacheTest.java | 5 +- .../plugins/blob/datastore/BlobIdTrackerTest.java | 4 +- .../blob/datastore/DataStoreBlobStoreTest.java | 1 - .../oak/commons/collections/IterableUtils.java | 72 +++++++- .../oak/commons/collections/IteratorUtils.java | 31 ++++ .../oak/commons/collections/IterableUtilsTest.java | 194 ++++++++++++++++++++- .../oak/commons/collections/IteratorUtilsTest.java | 134 ++++++++++++++ .../main/java/org/apache/jackrabbit/oak/Oak.java | 1 - .../oak/plugins/identifier/IdentifierManager.java | 1 - .../oak/plugins/index/IndexInfoServiceImpl.java | 1 - .../oak/plugins/index/IndexPathServiceImpl.java | 1 - .../jackrabbit/oak/plugins/index/IndexUtils.java | 1 - .../index/nodetype/NodeTypeIndexLookup.java | 2 - .../oak/plugins/index/property/PropertyIndex.java | 2 - .../index/property/PropertyIndexLookup.java | 1 - .../plugins/index/property/PropertyIndexPlan.java | 1 - .../plugins/index/property/RecursiveDelete.java | 1 - .../index/property/jmx/PropertyIndexStats.java | 1 - .../plugins/index/reference/ReferenceIndex.java | 1 - .../oak/plugins/index/upgrade/IndexDisabler.java | 1 - .../migration/AbstractDecoratedNodeState.java | 1 - .../oak/plugins/name/NamespaceEditor.java | 1 - .../plugins/nodetype/EffectiveNodeTypeImpl.java | 1 - .../oak/plugins/nodetype/NodeTypeImpl.java | 1 - .../oak/plugins/nodetype/TypeEditor.java | 1 - .../oak/plugins/nodetype/TypePredicate.java | 1 - .../oak/plugins/nodetype/TypeRegistration.java | 1 - .../plugins/observation/filter/FilterBuilder.java | 1 - .../authentication/token/TokenLoginModule.java | 1 - .../authentication/user/LoginModuleImpl.java | 1 - .../authorization/AuthorizationContext.java | 1 - .../security/authorization/accesscontrol/ACL.java | 1 - .../accesscontrol/AccessControlManagerImpl.java | 1 - .../accesscontrol/AccessControlValidator.java | 1 - .../authorization/permission/ChildOrderDiff.java | 1 - .../authorization/restriction/GlobsPattern.java | 1 - .../authorization/restriction/SubtreePattern.java | 1 - .../internal/SecurityProviderRegistration.java | 1 - .../user/CachedPrincipalMembershipReader.java | 1 - .../oak/security/user/PasswordHistory.java | 1 - .../jackrabbit/oak/security/user/UserImporter.java | 1 - .../oak/security/user/UserManagerImpl.java | 1 - .../jackrabbit/oak/core/SecureNodeBuilderTest.java | 1 - .../plugins/index/property/PropertyIndexTest.java | 1 - .../plugins/migration/FilteringNodeStateTest.java | 3 +- .../oak/plugins/tree/impl/ImmutableTreeTest.java | 1 - .../oak/plugins/tree/impl/TreeUtilTest.java | 1 - .../AuthenticationConfigurationImplTest.java | 1 - .../AuthorizationConfigurationImplOSGiTest.java | 1 - .../AccessControlManagerImplTest.java | 1 - .../EffectivePoliciesByPrincipalsAndPathsTest.java | 23 +-- .../accesscontrol/RemappedPrivilegeNamesTest.java | 1 - .../evaluation/AbstractQueryTest.java | 1 - .../evaluation/ChildOrderPropertyTest.java | 1 - .../evaluation/TraversingQueryTest.java | 1 - .../permission/PermissionHookTest.java | 1 - .../restriction/GlobsPatternTest.java | 4 +- .../internal/InternalSecurityProviderTest.java | 1 - .../internal/SecurityProviderRegistrationTest.java | 1 - .../oak/security/principal/EveryoneFilterTest.java | 13 +- .../oak/security/privilege/JcrAllTest.java | 1 - .../privilege/PrivilegeDefinitionWriterTest.java | 1 - .../oak/security/privilege/PrivilegeImplTest.java | 1 - .../security/user/AbstractAddMembersByIdTest.java | 1 - .../user/AddMembersByIdBestEffortTest.java | 11 +- .../security/user/AuthorizableIteratorTest.java | 11 +- .../security/user/CachedGroupPrincipalTest.java | 1 - .../oak/security/user/DuplicateMembershipTest.java | 17 +- .../oak/security/user/MembershipBaseTest.java | 1 - .../oak/security/user/MembershipProviderTest.java | 13 +- .../oak/security/user/PasswordHistoryTest.java | 6 +- .../oak/security/user/UserContextTest.java | 1 - .../oak/security/user/UserInitializerTest.java | 1 - .../security/user/UserPrincipalProviderTest.java | 3 +- .../oak/security/user/action/GroupActionTest.java | 1 - .../security/user/query/ResultIteratorTest.java | 9 +- .../user/query/XPathConditionVisitorTest.java | 4 +- oak-doc/src/site/markdown/nodestore/compositens.md | 2 +- oak-examples/webapp/pom.xml | 2 +- .../external/CustomExternalIdentityProvider.java | 1 - .../ThreeRolesPermissionProvider.java | 1 - .../L5_CustomPermissionEvaluationTest.java | 1 - .../principalbased/AbstractPrincipalBasedTest.java | 4 +- .../privilege/L3_BuiltInPrivilegesTest.java | 1 - .../security/privilege/L4_CustomPrivilegeTest.java | 11 +- .../oak/composite/CompositeNodeStoreTest.java | 3 +- .../jackrabbit/oak/spi/state/NodeStoreTest.java | 1 - .../jackrabbit/oak/jcr/session/NodeImpl.java | 4 +- .../jackrabbit/oak/jcr/xml/ImporterImpl.java | 1 - .../apache/jackrabbit/oak/jcr/ConcurrentAddIT.java | 7 +- .../oak/jcr/ConcurrentAddReferenceTest.java | 5 +- .../jackrabbit/oak/jcr/OakRepositoryStub.java | 2 - .../jackrabbit/oak/jcr/ObservationQueueTest.java | 1 - .../jackrabbit/oak/jcr/OperationLoggerTest.java | 4 +- .../apache/jackrabbit/oak/jcr/PropertyTest.java | 9 +- .../jackrabbit/oak/jcr/binary/BinaryAccessIT.java | 1 - .../oak/jcr/observation/ObservationTest.java | 1 - .../security/user/GroupImportBestEffortTest.java | 6 +- .../oak/plugins/index/lucene/IndexTracker.java | 1 - .../oak/plugins/index/lucene/LuceneIndex.java | 1 - .../plugins/index/lucene/LuceneIndexMBeanImpl.java | 1 - .../index/lucene/LuceneIndexNodeManager.java | 1 - .../plugins/index/lucene/LucenePropertyIndex.java | 1 - .../lucene/directory/CopyOnWriteDirectory.java | 1 - .../index/lucene/directory/IndexRootDirectory.java | 1 - .../index/lucene/hybrid/LuceneDocumentHolder.java | 1 - .../index/lucene/property/BucketSwitcher.java | 1 - .../lucene/property/HybridPropertyIndexInfo.java | 1 - .../lucene/property/HybridPropertyIndexLookup.java | 1 - .../property/UniquenessConstraintValidator.java | 1 - .../index/lucene/util/IndexDefinitionBuilder.java | 1 - .../ActiveDeletedBlobCollectorMBeanImplTest.java | 4 +- .../index/lucene/IndexAugmentorFactoryTest.java | 1 - .../index/lucene/LucenePropertyIndexTest.java | 1 - .../directory/AbstractActiveDeletedBlobTest.java | 8 +- .../ConcurrentCopyOnReadDirectoryTest.java | 1 - .../lucene/directory/OakDirectoryTestBase.java | 6 +- .../index/lucene/hybrid/HybridIndexTest.java | 4 +- .../hybrid/LuceneJournalPropertyBuilderTest.java | 1 - .../property/LuceneIndexPropertyQueryTest.java | 1 - .../index/lucene/property/RecursiveDeleteTest.java | 1 - .../util/LuceneIndexDefinitionBuilderTest.java | 1 - .../index/lucene/util/TapeSamplingTest.java | 4 +- .../lucene/writer/MultiplexingIndexWriterTest.java | 1 - oak-parent/pom.xml | 6 +- .../document/flatfile/ChildNodeStateProvider.java | 4 +- .../flatfile/FlatFileNodeStoreBuilder.java | 1 - .../incrementalstore/IncrementalStoreBuilder.java | 1 - .../plugins/document/DocumentNodeStoreHelper.java | 1 - .../org/apache/jackrabbit/oak/run/cli/Options.java | 1 - .../flatfile/ChildNodeStateProviderTest.java | 1 - .../flatfile/FlatFileStoreIteratorTest.java | 4 +- .../index/indexer/document/flatfile/TestUtils.java | 1 - .../linkedList/FlatFileBufferLinkedListTest.java | 18 +- .../PipelinedMongoConnectionFailureIT.java | 4 +- .../oak/console/commands/CdCommand.groovy | 1 - .../oak/console/commands/LsCommand.groovy | 1 - .../apache/jackrabbit/oak/run/FrozenNodeRef.java | 1 - .../jackrabbit/oak/run/RevisionsCommand.java | 18 ++ .../oak/index/DocumentStoreIndexerIT.java | 4 +- .../org/apache/jackrabbit/oak/index/ReindexIT.java | 4 +- .../oak/plugins/document/RevisionsCommandTest.java | 2 +- .../jackrabbit/oak/run/DataStoreCheckTest.java | 14 +- .../run/RevisionsCommandCustomBlobStoreTest.java | 8 +- .../index/elastic/ElasticIndexDefinition.java | 14 +- .../index/elastic/ElasticIndexStatistics.java | 5 +- .../index/elastic/index/ElasticDocument.java | 8 +- .../index/elastic/index/ElasticDocumentMaker.java | 14 +- .../index/elastic/index/ElasticIndexHelper.java | 20 ++- .../index/elastic/query/ElasticRequestHandler.java | 33 ++-- .../facets/ElasticSecureFacetAsyncProvider.java | 8 +- .../ElasticStatisticalFacetAsyncProvider.java | 8 +- .../index/elastic/util/ElasticIndexUtils.java | 70 +++++++- .../index/elastic/ElasticConnectionRule.java | 2 +- .../plugins/index/elastic/ElasticContentTest.java | 9 +- .../index/elastic/ElasticIndexAggregationTest.java | 82 +++++++++ .../elastic/ElasticIndexSuggestionCommonTest.java | 2 +- .../index/elastic/ElasticPropertyIndexTest.java | 64 ++++++- .../elastic/ElasticRegexPropertyIndexTest.java | 16 +- .../index/elastic/ElasticReliabilityTest.java | 4 +- .../index/elastic/ElasticSimilarQueryTest.java | 8 +- ...cDocumentMakerLargeStringPropertiesLogTest.java | 2 +- .../elastic/index/ElasticIndexHelperTest.java | 7 +- .../index/elastic/util/ElasticIndexUtilsTest.java | 139 +++++++++++++++ .../search/spi/query/FulltextIndexPlanner.java | 1 - .../search/spi/query/FulltextIndexTracker.java | 1 - .../oak/plugins/index/search/util/ConfigUtil.java | 1 - .../index/search/util/IndexDefinitionBuilder.java | 1 - .../oak/plugins/index/IndexPlannerCommonTest.java | 2 +- .../oak/plugins/index/OrderByCommonTest.java | 1 - .../oak/plugins/index/search/AggregateTest.java | 1 - .../index/search/util/TapeSamplingTest.java | 4 +- .../jackrabbit/oak/plugins/tree/TreeUtil.java | 2 - .../oak/spi/security/CompositeConfiguration.java | 1 - .../security/privilege/PrivilegeBitsProvider.java | 1 - .../jackrabbit/oak/plugins/tree/TreeUtilTest.java | 1 - .../spi/security/CompositeConfigurationTest.java | 1 - .../oak/spi/security/OpenSecurityProviderTest.java | 1 - .../security/authentication/AuthInfoImplTest.java | 1 - .../authorization/accesscontrol/ACETest.java | 1 - .../accesscontrol/ImmutableACLTest.java | 1 - .../authorization/permission/PermissionsTest.java | 1 - .../AbstractRestrictionProviderTest.java | 4 +- .../principal/CompositePrincipalProviderTest.java | 2 - .../security/principal/TestPrincipalProvider.java | 1 - .../privilege/PrivilegeBitsProviderTest.java | 1 - .../spi/security/privilege/PrivilegeUtilTest.java | 1 - .../jackrabbit/oak/segment/file/tar/TarFiles.java | 2 - .../oak/segment/SegmentCompactionIT.java | 10 +- .../oak/segment/SegmentOverflowExceptionIT.java | 4 +- .../oak/segment/file/proc/DataSegmentNodeTest.java | 1 - .../nodestate/NodeStateSolrServerProvider.java | 1 - .../nodestate/OakSolrNodeStateConfiguration.java | 1 - .../plugins/index/solr/query/SolrQueryIndex.java | 1 - .../oak/composite/CompositeChildrenCountTest.java | 9 +- .../jackrabbit/oak/plugins/document/Branch.java | 2 - .../oak/plugins/document/DocumentNodeState.java | 1 - .../oak/plugins/document/DocumentNodeStore.java | 2 - .../plugins/document/DocumentNodeStoreBranch.java | 1 - .../oak/plugins/document/JournalEntry.java | 1 - .../oak/plugins/document/LastRevRecoveryAgent.java | 1 - .../oak/plugins/document/MissingLastRevSeeker.java | 2 - .../oak/plugins/document/NodeDocument.java | 1 - .../oak/plugins/document/TieredDiffCache.java | 1 - .../oak/plugins/document/UnsavedModifications.java | 2 - .../oak/plugins/document/VersionGCSupport.java | 2 - .../document/bundlor/BundlingConfigHandler.java | 1 - .../plugins/document/cache/NodeDocumentCache.java | 2 - .../plugins/document/mongo/MongoDocumentStore.java | 1 - .../async/InvalidateCacheAction.java | 2 - .../plugins/document/rdb/RDBDocumentStoreJDBC.java | 2 - .../plugins/document/rdb/RDBVersionGCSupport.java | 1 - .../secondary/DelegatingDocumentNodeState.java | 1 - .../document/ClusterRevisionComparisonTest.java | 2 - .../plugins/document/ConcurrentReadAndAddTest.java | 2 - .../plugins/document/DocumentMKBuilderTest.java | 5 +- .../document/DocumentNodeStoreSweepTest.java | 1 - .../plugins/document/DocumentNodeStoreTest.java | 1 - .../oak/plugins/document/DocumentSplitTest.java | 2 - .../oak/plugins/document/JournalGCTest.java | 2 - .../plugins/document/LargeMergeRecoveryTest.java | 10 +- .../plugins/document/LastRevRecoveryAgentTest.java | 14 +- .../oak/plugins/document/LastRevRecoveryTest.java | 2 - .../document/LastRevSingleNodeRecoveryTest.java | 2 - .../plugins/document/MissingLastRevSeekerTest.java | 2 - .../MongoVersionGCSupportDefaultNoBranchTest.java | 5 +- .../oak/plugins/document/NodeDocumentTest.java | 20 +-- .../oak/plugins/document/PreviousDocCacheTest.java | 6 +- .../oak/plugins/document/RevisionVectorTest.java | 2 - .../oak/plugins/document/ValueMapTest.java | 6 +- .../plugins/document/VersionGCDeletionTest.java | 4 +- .../oak/plugins/document/VersionGCQueryTest.java | 8 +- .../oak/plugins/document/VersionGCSweepTest.java | 4 +- .../oak/plugins/document/VersionGCTest.java | 1 - .../document/VersionGarbageCollectorIT.java | 7 +- .../document/bundlor/DocumentBundlingTest.java | 2 - .../document/mongo/LeaseUpdateSocketTimeoutIT.java | 1 + .../secondary/DelegatingDocumentNodeStateTest.java | 1 - .../secondary/SecondaryStoreCacheTest.java | 1 - .../oak/plugins/document/util/UtilsTest.java | 2 - .../oak/plugins/memory/AbstractPropertyState.java | 1 - .../oak/plugins/memory/MemoryChildNodeEntry.java | 1 - .../oak/plugins/memory/MultiPropertyState.java | 1 - .../oak/plugins/memory/PropertyStates.java | 2 - .../jackrabbit/oak/spi/commit/MoveTracker.java | 1 - .../oak/spi/state/AbstractNodeState.java | 2 - .../upgrade/checkpoint/CheckpointRetriever.java | 1 - .../oak/upgrade/UpgradeOldSegmentTest.java | 6 +- 289 files changed, 1117 insertions(+), 514 deletions(-)
