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/05/23 06:27:02 UTC
(jackrabbit-oak) branch OAK-10711 created (now 4c589eac8d)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-10711
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 4c589eac8d OAK-10711 : replaced preconditions.checkNotNull with Objects.requireNotNull
This branch includes the following new commits:
new 4c589eac8d OAK-10711 : replaced preconditions.checkNotNull with Objects.requireNotNull
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-10711 : replaced preconditions.checkNotNull with Objects.requireNotNull
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-10711
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 4c589eac8d7ee7f63faa0ff9995b019cea607e90
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Thu May 23 11:54:19 2024 +0530
OAK-10711 : replaced preconditions.checkNotNull with Objects.requireNotNull
---
.../external/impl/DynamicSyncContext.java | 4 +-
.../external/impl/jmx/Delegatee.java | 4 +-
.../principal/DynamicGroupValidatorProvider.java | 4 +-
.../authorization/cug/impl/CugValidatorTest.java | 4 +-
.../authorization/cug/impl/VersionTest.java | 22 ++++----
.../impl/AbstractPrincipalBasedTest.java | 4 +-
.../impl/PermissionProviderVersionTest.java | 6 +--
.../impl/VersionTreePermissionTest.java | 4 +-
.../benchmark/util/ElasticGlobalInitializer.java | 4 +-
.../jackrabbit/oak/benchmark/HybridIndexTest.java | 4 +-
.../oak/benchmark/CompositeAuthorizationTest.java | 4 +-
.../apache/jackrabbit/oak/benchmark/CugTest.java | 4 +-
.../oak/benchmark/PropertyFullTextTest.java | 4 +-
.../principalbased/PrinicipalBasedReadTest.java | 4 +-
.../apache/jackrabbit/oak/plugins/blob/BlobGC.java | 6 +--
.../oak/plugins/blob/BlobStoreStats.java | 4 +-
.../plugins/blob/MarkSweepGarbageCollector.java | 4 +-
.../oak/plugins/blob/cloud/CloudBlobStore.java | 13 ++---
.../plugins/blob/datastore/DataStoreBlobStore.java | 12 ++---
.../blob/datastore/FileDataStoreService.java | 4 +-
.../jackrabbit/oak/spi/blob/AbstractBlobStore.java | 6 +--
.../apache/jackrabbit/oak/commons/StringUtils.java | 6 +--
.../apache/jackrabbit/oak/spi/mount/MountInfo.java | 4 +-
.../oak/spi/whiteboard/AbstractServiceTracker.java | 6 +--
.../oak/spi/whiteboard/DefaultWhiteboard.java | 12 ++---
.../jackrabbit/oak/stats/StopwatchLogger.java | 14 ++---
.../main/java/org/apache/jackrabbit/oak/Oak.java | 34 ++++++------
.../jackrabbit/oak/core/ContentRepositoryImpl.java | 10 ++--
.../apache/jackrabbit/oak/core/MutableRoot.java | 18 +++----
.../apache/jackrabbit/oak/core/MutableTree.java | 32 +++++------
.../jackrabbit/oak/core/SecureNodeBuilder.java | 6 +--
.../jackrabbit/oak/core/SecureNodeState.java | 6 +--
.../oak/management/RepositoryManager.java | 4 +-
.../oak/namepath/impl/GlobalNameMapper.java | 4 +-
.../oak/namepath/impl/LocalNameMapper.java | 6 +--
.../oak/plugins/atomic/AtomicCounterEditor.java | 26 ++++-----
.../oak/plugins/index/AsyncIndexInfo.java | 4 +-
.../oak/plugins/index/AsyncIndexUpdate.java | 16 +++---
.../oak/plugins/index/IndexInfoServiceImpl.java | 4 +-
.../jackrabbit/oak/plugins/index/IndexUpdate.java | 12 ++---
.../plugins/index/TrackingCorruptIndexHandler.java | 4 +-
.../oak/plugins/index/cursor/Cursors.java | 4 +-
.../datastore/DataStoreTextProviderService.java | 4 +-
.../index/datastore/DataStoreTextWriter.java | 6 +--
.../oak/plugins/index/fulltext/ExtractedText.java | 4 +-
.../index/importer/AbortingIndexerLock.java | 6 +--
.../oak/plugins/index/importer/IndexImporter.java | 14 ++---
.../oak/plugins/index/importer/IndexerInfo.java | 4 +-
.../oak/plugins/index/importer/NodeStoreUtils.java | 4 +-
.../oak/plugins/index/importer/PropUtils.java | 4 +-
.../oak/plugins/index/inventory/IndexPrinter.java | 6 +--
.../property/jmx/PropertyIndexAsyncReindex.java | 6 +--
.../oak/plugins/index/upgrade/IndexDisabler.java | 4 +-
.../oak/plugins/migration/NodeStateCopier.java | 30 +++++------
.../plugins/nodetype/AbstractTypeDefinition.java | 12 ++---
.../plugins/nodetype/EffectiveNodeTypeImpl.java | 6 +--
.../oak/plugins/nodetype/EffectiveType.java | 4 +-
.../oak/plugins/nodetype/ItemDefinitionImpl.java | 4 +-
.../plugins/nodetype/ReadOnlyNodeTypeManager.java | 10 ++--
.../oak/plugins/nodetype/TypeEditor.java | 16 +++---
.../oak/plugins/nodetype/TypePredicate.java | 8 +--
.../write/PropertyDefinitionTemplateImpl.java | 4 +-
.../plugins/observation/FilteringDispatcher.java | 4 +-
.../oak/plugins/observation/FilteringObserver.java | 6 +--
.../oak/plugins/observation/filter/ACFilter.java | 18 +++----
.../plugins/observation/filter/FilterBuilder.java | 36 ++++++-------
.../oak/plugins/observation/filter/Filters.java | 10 ++--
.../observation/filter/GlobbingPathFilter.java | 10 ++--
.../observation/filter/PropertyPredicate.java | 6 +--
.../observation/filter/RelativePathSelector.java | 6 +--
.../observation/filter/UniversalFilter.java | 10 ++--
.../plugins/observation/filter/UuidPredicate.java | 4 +-
.../oak/plugins/tree/impl/AbstractMutableTree.java | 14 ++---
.../oak/plugins/tree/impl/HiddenTree.java | 4 +-
.../oak/plugins/tree/impl/NodeBuilderTree.java | 4 +-
.../plugins/version/OrphanedVersionCleaner.java | 2 +-
.../plugins/version/ReadOnlyVersionManager.java | 6 +--
.../plugins/version/ReadWriteVersionManager.java | 14 ++---
.../jackrabbit/oak/plugins/version/Utils.java | 6 +--
.../oak/plugins/version/VersionEditor.java | 12 ++---
.../oak/plugins/version/VersionStorageEditor.java | 10 ++--
.../oak/plugins/version/VersionableState.java | 18 +++----
.../jackrabbit/oak/query/QueryEngineImpl.java | 6 +--
.../org/apache/jackrabbit/oak/query/QueryImpl.java | 8 +--
.../apache/jackrabbit/oak/query/SQL2Parser.java | 8 +--
.../oak/query/ast/AstElementFactory.java | 4 +-
.../jackrabbit/oak/query/ast/ColumnImpl.java | 8 +--
.../oak/query/ast/NotFullTextSearchImpl.java | 4 +-
.../jackrabbit/oak/query/ast/SelectorImpl.java | 6 +--
.../oak/security/SecurityProviderImpl.java | 4 +-
.../security/authorization/accesscontrol/ACL.java | 4 +-
.../accesscontrol/AccessControlImporter.java | 4 +-
.../accesscontrol/AccessControlManagerImpl.java | 6 +--
.../accesscontrol/AccessControlValidator.java | 8 +--
.../permission/PermissionValidator.java | 4 +-
.../authorization/restriction/GlobPattern.java | 4 +-
.../security/user/AuthorizableBaseProvider.java | 6 +--
.../oak/security/user/CacheValidatorProvider.java | 4 +-
.../jackrabbit/oak/security/user/UserImporter.java | 4 +-
.../jackrabbit/oak/security/user/UserProvider.java | 4 +-
.../oak/security/user/UserValidator.java | 6 +--
.../plugins/atomic/AtomicCounterEditorTest.java | 18 +++----
.../oak/plugins/index/IndexUpdateTest.java | 4 +-
.../nodetype/write/NodeTypeRegistryTest.java | 4 +-
.../version/ReadOnlyVersionManagerNtTest.java | 4 +-
.../version/ReadOnlyVersionManagerTest.java | 12 ++---
.../jackrabbit/oak/query/AbstractQueryTest.java | 8 +--
.../oak/query/SQL2OptimiseQueryTest.java | 12 ++---
.../jackrabbit/oak/query/ast/AndImplTest.java | 6 +--
.../oak/query/index/TraversingIndexQueryTest.java | 6 +--
.../authentication/token/AbstractTokenTest.java | 4 +-
.../AccessControlManagerImplTest.java | 6 +--
.../evaluation/AbstractOakCoreTest.java | 4 +-
.../permission/CompiledPermissionImplTest.java | 4 +-
.../permission/VersionTreePermissionTest.java | 12 ++---
.../oak/security/privilege/JcrAllTest.java | 4 +-
.../security/privilege/PrivilegeValidatorTest.java | 4 +-
.../user/UserImporterMembershipIgnoreTest.java | 4 +-
.../oak/security/user/UserValidatorTest.java | 4 +-
.../security/user/query/UserQueryManagerTest.java | 4 +-
.../org/apache/jackrabbit/oak/util/NodeUtil.java | 6 +--
.../permission/L1_IntroductionTest.java | 4 +-
.../L2_AccessControlManagementTest.java | 10 ++--
.../L3_PermissionEvaluationTest.java | 6 +--
.../L4_DisabledAggregationFilterTest.java | 6 +--
.../jackrabbit/oak/spi/state/NodeStoreTest.java | 4 +-
.../java/org/apache/jackrabbit/oak/jcr/Jcr.java | 34 ++++++------
.../jackrabbit/oak/jcr/delegate/ItemDelegate.java | 4 +-
.../oak/jcr/delegate/PropertyDelegate.java | 6 +--
.../oak/jcr/delegate/SessionDelegate.java | 16 +++---
.../oak/jcr/delegate/VersionDelegate.java | 4 +-
.../oak/jcr/delegate/VersionHistoryDelegate.java | 10 ++--
.../oak/jcr/delegate/VersionManagerDelegate.java | 16 +++---
.../oak/jcr/delegate/WorkspaceDelegate.java | 4 +-
.../apache/jackrabbit/oak/jcr/lock/LockImpl.java | 6 +--
.../oak/jcr/observation/ChangeProcessor.java | 8 +--
.../observation/ConsolidatedListenerMBeanImpl.java | 4 +-
.../oak/jcr/observation/OakEventFilterImpl.java | 6 +--
.../oak/jcr/repository/RepositoryImpl.java | 8 +--
.../jackrabbit/oak/jcr/session/NodeImpl.java | 16 +++---
.../jackrabbit/oak/jcr/session/SessionContext.java | 12 ++---
.../oak/jcr/version/FrozenNodeLogger.java | 4 +-
.../oak/jcr/version/ReadWriteVersionManager.java | 16 +++---
.../jackrabbit/oak/jcr/version/VersionImpl.java | 4 +-
.../oak/jcr/version/VersionManagerImpl.java | 8 +--
.../jackrabbit/oak/jcr/version/VersionStorage.java | 4 +-
.../apache/jackrabbit/oak/jcr/AtomicCounterIT.java | 6 +--
.../jackrabbit/oak/jcr/AtomicCounterTest.java | 4 +-
.../jackrabbit/oak/jcr/DocumentClusterIT.java | 16 +++---
.../oak/jcr/security/user/GroupImportTest.java | 6 +--
.../ActiveDeletedBlobCollectorMBeanImpl.java | 10 ++--
.../oak/plugins/index/lucene/IndexTracker.java | 6 +--
.../index/lucene/LuceneIndexEditorProvider.java | 4 +-
.../index/lucene/LuceneIndexInfoProvider.java | 11 ++--
.../plugins/index/lucene/LuceneIndexMBeanImpl.java | 10 ++--
.../index/lucene/LuceneIndexProviderService.java | 10 ++--
.../plugins/index/lucene/LucenePropertyIndex.java | 6 +--
.../index/lucene/NodeStateAnalyzerFactory.java | 4 +-
.../lucene/directory/BufferedOakDirectory.java | 8 +--
.../lucene/directory/IndexConsistencyChecker.java | 8 +--
.../plugins/index/lucene/directory/IndexMeta.java | 6 +--
.../index/lucene/directory/IndexRootDirectory.java | 4 +-
.../lucene/directory/OakBufferedIndexFile.java | 6 +--
.../lucene/directory/OakStreamingIndexFile.java | 6 +--
.../index/lucene/hybrid/ExternalIndexObserver.java | 6 +--
.../lucene/hybrid/ExternalObserverBuilder.java | 10 ++--
.../plugins/index/lucene/hybrid/IndexedPaths.java | 4 +-
.../oak/plugins/index/lucene/hybrid/LuceneDoc.java | 8 +--
.../index/lucene/hybrid/LuceneDocumentHolder.java | 6 +--
.../oak/plugins/index/lucene/hybrid/NRTIndex.java | 4 +-
.../index/lucene/hybrid/NRTIndexFactory.java | 4 +-
.../lucene/property/PropertyIndexCleaner.java | 10 ++--
.../property/PropertyIndexUpdateCallback.java | 6 +--
.../property/UniquenessConstraintValidator.java | 4 +-
.../index/lucene/util/IndexDefinitionBuilder.java | 6 +--
.../index/lucene/util/LuceneInitializerHelper.java | 4 +-
.../index/lucene/writer/DefaultIndexWriter.java | 8 +--
.../lucene/writer/DefaultIndexWriterFactory.java | 8 +--
.../oak/plugins/index/lucene/IndexPlannerTest.java | 6 +--
.../oak/plugins/index/lucene/TestUtil.java | 4 +-
.../oak/run/osgi/OakOSGiRepositoryFactory.java | 6 +--
.../jackrabbit/oak/fixture/BlobStoreFixture.java | 4 +-
.../apache/jackrabbit/oak/index/IndexHelper.java | 6 +--
.../jackrabbit/oak/index/IndexerSupport.java | 6 +--
.../jackrabbit/oak/index/OutOfBandIndexerBase.java | 6 +--
.../apache/jackrabbit/oak/index/PrinterDumper.java | 4 +-
.../index/indexer/document/CompositeIndexer.java | 4 +-
.../indexer/document/DocumentStoreIndexerBase.java | 8 +--
.../linkedList/FlatFileBufferLinkedList.java | 7 +--
.../oak/indexversion/PurgeOldVersionUtils.java | 6 +--
.../oak/run/cli/DocumentFixtureProvider.java | 4 +-
.../org/apache/jackrabbit/oak/run/cli/Options.java | 5 +-
.../oak/run/cli/SegmentFixtureProvider.java | 4 +-
.../oak/run/cli/SegmentTarFixtureProvider.java | 4 +-
.../apache/jackrabbit/oak/run/commons/Modes.java | 4 +-
.../jackrabbit/oak/index/ElasticIndexCommand.java | 2 +-
.../oak/console/commands/LuceneCommand.groovy | 6 +--
.../jackrabbit/oak/exporter/CNDStreamWriter.java | 4 +-
.../apache/jackrabbit/oak/index/IndexCommand.java | 4 +-
.../jackrabbit/oak/index/OutOfBandIndexer.java | 4 +-
.../index/SegmentPropertyIndexEditorProvider.java | 4 +-
.../oak/plugins/tika/BinaryResource.java | 8 +--
.../oak/plugins/tika/TextExtractorMain.java | 24 ++++-----
.../jackrabbit/oak/run/DataStoreCommand.java | 6 +--
.../search/CompositePropertyUpdateCallback.java | 4 +-
.../oak/plugins/index/search/IndexDefinition.java | 12 ++---
.../search/spi/editor/FulltextDocumentMaker.java | 8 +--
.../spi/editor/FulltextIndexEditorContext.java | 6 +--
.../search/spi/query/FulltextIndexTracker.java | 6 +--
.../index/search/util/IndexDefinitionBuilder.java | 8 +--
.../index/search/util/NodeStateCopyUtils.java | 4 +-
.../oak/plugins/index/IndexPlannerCommonTest.java | 6 +--
.../jackrabbit/oak/plugins/index/TestUtil.java | 4 +-
.../oak/plugins/index/search/TestUtil.java | 4 +-
.../restriction/RestrictionDefinitionImpl.java | 4 +-
.../principal/CompositePrincipalProvider.java | 4 +-
.../oak/spi/security/principal/PrincipalImpl.java | 4 +-
.../oak/spi/security/user/util/PasswordUtil.java | 6 +--
.../oak/spi/security/user/util/UserUtil.java | 4 +-
.../oak/segment/aws/tool/AwsCompact.java | 6 +--
.../oak/segment/aws/tool/AwsSegmentCopy.java | 14 ++---
.../oak/segment/azure/tool/AzureCompact.java | 12 ++---
.../oak/segment/azure/tool/SegmentCopy.java | 14 ++---
.../backup/impl/FileStoreBackupRestoreImpl.java | 12 ++---
.../apache/jackrabbit/oak/segment/BlockRecord.java | 4 +-
.../oak/segment/CachingSegmentReader.java | 4 +-
.../jackrabbit/oak/segment/ClassicCompactor.java | 14 ++---
.../oak/segment/DefaultSegmentWriter.java | 20 +++----
.../oak/segment/DefaultSegmentWriterBuilder.java | 16 +++---
.../apache/jackrabbit/oak/segment/MapEntry.java | 10 ++--
.../apache/jackrabbit/oak/segment/MapRecord.java | 8 +--
.../jackrabbit/oak/segment/ParallelCompactor.java | 12 ++---
.../jackrabbit/oak/segment/PropertyTemplate.java | 10 ++--
.../apache/jackrabbit/oak/segment/ReaderCache.java | 6 +--
.../apache/jackrabbit/oak/segment/RecordCache.java | 6 +--
.../jackrabbit/oak/segment/RecordCacheStats.java | 8 +--
.../apache/jackrabbit/oak/segment/RecordId.java | 6 +--
.../org/apache/jackrabbit/oak/segment/Segment.java | 16 +++---
.../oak/segment/SegmentBufferWriter.java | 12 ++---
.../oak/segment/SegmentBufferWriterPool.java | 18 +++----
.../jackrabbit/oak/segment/SegmentCache.java | 4 +-
.../jackrabbit/oak/segment/SegmentNodeBuilder.java | 6 +--
.../jackrabbit/oak/segment/SegmentNodeState.java | 10 ++--
.../jackrabbit/oak/segment/SegmentNodeStore.java | 12 ++---
.../jackrabbit/oak/segment/SegmentParser.java | 4 +-
.../oak/segment/SegmentPropertyState.java | 10 ++--
.../jackrabbit/oak/segment/SegmentStream.java | 10 ++--
.../jackrabbit/oak/segment/SegmentTracker.java | 4 +-
.../apache/jackrabbit/oak/segment/Template.java | 14 ++---
.../jackrabbit/oak/segment/WriterCacheManager.java | 6 +--
.../segment/compaction/SegmentRevisionGCMBean.java | 8 +--
.../oak/segment/file/FileStoreBuilder.java | 16 +++---
.../oak/segment/file/FileStoreGCMonitor.java | 4 +-
.../jackrabbit/oak/segment/file/GCJournal.java | 4 +-
.../jackrabbit/oak/segment/file/PriorityCache.java | 6 +--
.../oak/segment/file/ReadOnlyRevisions.java | 4 +-
.../jackrabbit/oak/segment/file/Reclaimers.java | 4 +-
.../jackrabbit/oak/segment/file/SafeRunnable.java | 6 +--
.../oak/segment/file/tar/GCGeneration.java | 6 +--
.../jackrabbit/oak/segment/file/tar/TarFiles.java | 12 ++---
.../jackrabbit/oak/segment/file/tar/TarWriter.java | 4 +-
.../oak/segment/file/tooling/RevisionHistory.java | 8 +--
.../jackrabbit/oak/segment/scheduler/Commit.java | 8 +--
.../oak/segment/scheduler/LockBasedScheduler.java | 8 +--
.../segment/spi/monitor/CompositeIOMonitor.java | 6 +--
.../persistentcache/SegmentCacheStats.java | 6 +--
.../apache/jackrabbit/oak/segment/tool/Backup.java | 10 ++--
.../apache/jackrabbit/oak/segment/tool/Check.java | 8 +--
.../jackrabbit/oak/segment/tool/Compact.java | 8 +--
.../jackrabbit/oak/segment/tool/DebugSegments.java | 8 +--
.../jackrabbit/oak/segment/tool/DebugStore.java | 6 +--
.../jackrabbit/oak/segment/tool/DebugTars.java | 6 +--
.../apache/jackrabbit/oak/segment/tool/Diff.java | 18 +++----
.../jackrabbit/oak/segment/tool/History.java | 14 ++---
.../oak/segment/tool/RecoverJournal.java | 8 +--
.../jackrabbit/oak/segment/tool/Restore.java | 10 ++--
.../jackrabbit/oak/segment/tool/Revisions.java | 10 ++--
.../jackrabbit/oak/segment/tool/SearchNodes.java | 16 +++---
.../segment/tool/iotrace/DefaultIOTraceWriter.java | 4 +-
.../oak/segment/tool/iotrace/IOTraceLogWriter.java | 4 +-
.../oak/segment/tool/iotrace/IOTracer.java | 8 +--
.../LockBasedSchedulerCheckpointTest.java | 4 +-
.../oak/composite/CompositeNodeStore.java | 12 ++---
.../checks/NodeTypeMountedNodeStoreChecker.java | 6 +--
.../NonDefaultMountWriteReportingObserver.java | 4 +-
.../checks/NodeStoreChecksServiceTest.java | 4 +-
.../oak/plugins/document/BatchCommitQueue.java | 4 +-
.../jackrabbit/oak/plugins/document/Branch.java | 30 +++++------
.../oak/plugins/document/Checkpoints.java | 6 +--
.../oak/plugins/document/ClusterNodeInfo.java | 6 +--
.../plugins/document/ClusterNodeInfoDocument.java | 4 +-
.../jackrabbit/oak/plugins/document/Collision.java | 14 ++---
.../jackrabbit/oak/plugins/document/Commit.java | 6 +--
.../oak/plugins/document/CommitBuilder.java | 26 ++++-----
.../oak/plugins/document/CommitDiff.java | 8 +--
.../oak/plugins/document/CommitQueue.java | 12 ++---
.../oak/plugins/document/ConflictException.java | 12 ++---
.../document/DocumentBranchRootNodeState.java | 4 +-
.../oak/plugins/document/DocumentNodeBuilder.java | 6 +--
.../oak/plugins/document/DocumentNodeState.java | 10 ++--
.../oak/plugins/document/DocumentNodeStore.java | 34 ++++++------
.../plugins/document/DocumentNodeStoreBranch.java | 18 +++----
.../plugins/document/DocumentNodeStoreBuilder.java | 4 +-
.../document/DocumentNodeStoreMBeanImpl.java | 4 +-
.../plugins/document/DocumentNodeStoreService.java | 14 ++---
.../DocumentNodeStoreServiceConfiguration.java | 10 ++--
.../oak/plugins/document/DocumentRootBuilder.java | 10 ++--
.../plugins/document/DocumentStoreException.java | 4 +-
.../oak/plugins/document/DocumentStoreStats.java | 4 +-
.../document/FailedWithConflictException.java | 6 +--
.../oak/plugins/document/FormatVersion.java | 10 ++--
.../oak/plugins/document/JournalDiffLoader.java | 8 +--
.../oak/plugins/document/JournalEntry.java | 10 ++--
.../oak/plugins/document/MemoryDiffCache.java | 12 ++---
.../oak/plugins/document/MissingBcSweeper2.java | 8 +--
.../document/ModifiedDocumentNodeState.java | 10 ++--
.../oak/plugins/document/NamePathRev.java | 8 +--
.../oak/plugins/document/NodeDocument.java | 62 +++++++++++-----------
.../oak/plugins/document/NodeDocumentSweeper.java | 6 +--
.../jackrabbit/oak/plugins/document/Path.java | 12 ++---
.../jackrabbit/oak/plugins/document/PathRev.java | 6 +--
.../oak/plugins/document/PrefetchDispatcher.java | 4 +-
.../oak/plugins/document/PropertyHistory.java | 6 +--
.../jackrabbit/oak/plugins/document/Range.java | 6 +--
.../jackrabbit/oak/plugins/document/ResetDiff.java | 8 +--
.../jackrabbit/oak/plugins/document/Revision.java | 4 +-
.../oak/plugins/document/RevisionVector.java | 8 +--
.../jackrabbit/oak/plugins/document/Rollback.java | 8 +--
.../oak/plugins/document/SplitOperations.java | 14 ++---
.../oak/plugins/document/TimingHook.java | 6 +--
.../oak/plugins/document/UnmergedBranches.java | 6 +--
.../oak/plugins/document/UnsavedModifications.java | 14 ++---
.../jackrabbit/oak/plugins/document/UpdateOp.java | 18 +++----
.../oak/plugins/document/UpdateUtils.java | 4 +-
.../plugins/document/VersionGarbageCollector.java | 8 +--
.../document/bundlor/BundledDocumentDiffer.java | 4 +-
.../document/bundlor/BundlingConfigHandler.java | 4 +-
.../plugins/document/bundlor/BundlingHandler.java | 4 +-
.../plugins/document/mongo/MongoDBConnection.java | 10 ++--
.../oak/plugins/document/mongo/RevisionEntry.java | 4 +-
.../document/rdb/RDBDocumentSerializer.java | 4 +-
.../oak/plugins/document/rdb/RDBDocumentStore.java | 4 +-
.../secondary/DelegatingDocumentNodeState.java | 4 +-
.../oak/plugins/document/util/MongoConnection.java | 12 ++---
.../oak/plugins/document/util/RevisionsKey.java | 6 +--
.../oak/plugins/document/util/StringValue.java | 4 +-
.../oak/plugins/document/util/Utils.java | 12 ++---
.../plugins/document/SimpleRecoveryHandler.java | 6 +--
.../blob/ds/DocumentMKDataStoreReadTest.java | 4 +-
.../document/bundlor/BundlingHandlerTest.java | 6 +--
.../document/bundlor/DocumentBundlingTest.java | 4 +-
.../apache/jackrabbit/oak/json/JsonSerializer.java | 8 +--
.../org/apache/jackrabbit/oak/json/TypeCodes.java | 4 +-
.../oak/plugins/memory/BinaryPropertyState.java | 8 +--
.../oak/plugins/memory/DecimalPropertyState.java | 4 +-
.../oak/plugins/memory/EmptyPropertyState.java | 4 +-
.../oak/plugins/memory/GenericPropertyState.java | 6 +--
.../oak/plugins/memory/MemoryChildNodeEntry.java | 6 +--
.../oak/plugins/memory/MemoryNodeBuilder.java | 28 +++++-----
.../oak/plugins/memory/MemoryNodeStore.java | 16 +++---
.../oak/plugins/memory/ModifiedNodeState.java | 8 +--
.../oak/plugins/memory/MutableNodeState.java | 6 +--
.../oak/plugins/memory/StringPropertyState.java | 4 +-
.../oak/plugins/value/jcr/PartialValueFactory.java | 6 +--
.../oak/plugins/value/jcr/ValueFactoryImpl.java | 4 +-
.../oak/plugins/value/jcr/ValueImpl.java | 10 ++--
.../oak/spi/cluster/ClusterRepositoryInfo.java | 6 +--
.../oak/spi/commit/BackgroundObserver.java | 14 ++---
.../oak/spi/commit/ChangeDispatcher.java | 8 +--
.../jackrabbit/oak/spi/commit/CommitInfo.java | 6 +--
.../oak/spi/commit/CompositeConflictHandler.java | 4 +-
.../jackrabbit/oak/spi/commit/CompositeEditor.java | 4 +-
.../oak/spi/commit/CompositeEditorProvider.java | 4 +-
.../oak/spi/commit/CompositeObserver.java | 8 +--
.../jackrabbit/oak/spi/commit/DiffObserver.java | 4 +-
.../jackrabbit/oak/spi/commit/EditorDiff.java | 6 +--
.../jackrabbit/oak/spi/commit/EditorHook.java | 10 ++--
.../jackrabbit/oak/spi/commit/ObserverTracker.java | 6 +--
.../oak/spi/commit/ResetCommitAttributeHook.java | 4 +-
.../oak/spi/commit/SimpleCommitContext.java | 8 +--
.../jackrabbit/oak/spi/commit/SubtreeEditor.java | 6 +--
.../oak/spi/commit/SubtreeExcludingValidator.java | 6 +--
.../oak/spi/commit/SubtreeValidator.java | 6 +--
.../jackrabbit/oak/spi/commit/VisibleEditor.java | 4 +-
.../jackrabbit/oak/spi/state/NodeStateUtils.java | 6 +--
.../jackrabbit/oak/spi/state/ReadOnlyBuilder.java | 4 +-
.../jackrabbit/oak/spi/state/RevisionGC.java | 10 ++--
.../jackrabbit/oak/upgrade/BundleLoader.java | 8 +--
.../oak/upgrade/JackrabbitNodeState.java | 4 +-
.../jackrabbit/oak/upgrade/PersistingDiff.java | 6 +--
.../oak/upgrade/RepositorySidegrade.java | 8 +--
.../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 8 +--
.../oak/upgrade/blob/LengthCachingDataStore.java | 6 +--
.../oak/upgrade/cli/blob/LoopbackBlobStore.java | 8 +--
.../upgrade/cli/blob/LoopbackBlobStoreFactory.java | 4 +-
.../upgrade/cli/blob/SafeDataStoreBlobStore.java | 4 +-
396 files changed, 1565 insertions(+), 1565 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
index 92236533fa..36068ceab6 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
@@ -52,7 +52,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Extension of the {@code DefaultSyncContext} that doesn't synchronize group
@@ -315,7 +315,7 @@ public class DynamicSyncContext extends DefaultSyncContext {
// since 'shortcut' is omitted if dynamic groups are enabled, there is no need to test if 'external-group' is
// null, nor trying to retrieve external group again. if it could not be resolved during 'collectSyncEntries'
// before it didn't got added to the map
- checkNotNull(syncEntry.externalGroup, "Cannot create dynamic group from null ExternalIdentity.");
+ requireNonNull(syncEntry.externalGroup, "Cannot create dynamic group from null ExternalIdentity.");
// lookup of existing group by ID has been performed already including check for conflicting authorizable
// type or principal name
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
index 74396dd29c..0c0e52dfa5 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
@@ -56,7 +56,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
final class Delegatee {
@@ -361,7 +361,7 @@ final class Delegatee {
if (syncedIdentity != null && isMyIDP(syncedIdentity)) {
try {
// nonNull-ExternalIdRef has already been asserted by 'isMyIDP'
- ExternalIdentity extId = idp.getIdentity(checkNotNull(syncedIdentity.getExternalIdRef()));
+ ExternalIdentity extId = idp.getIdentity(requireNonNull(syncedIdentity.getExternalIdRef()));
if (extId == null) {
return syncedIdentity.getId();
}
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorProvider.java
index 81553c5ca6..44b46b28bc 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorProvider.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorProvider.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.DynamicGroupUtil.findGroupIdInHierarchy;
import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.DynamicGroupUtil.isGroup;
import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal.DynamicGroupUtil.isMemberProperty;
@@ -66,7 +66,7 @@ class DynamicGroupValidatorProvider extends ValidatorProvider implements Externa
this.treeProvider = treeProvider;
this.idpNamesWithDynamicGroups = idpNamesWithDynamicGroups;
- this.groupRootPath = checkNotNull(UserUtil.getAuthorizableRootPath(securityProvider.getParameters(UserConfiguration.NAME), AuthorizableType.GROUP));
+ this.groupRootPath = requireNonNull(UserUtil.getAuthorizableRootPath(securityProvider.getParameters(UserConfiguration.NAME), AuthorizableType.GROUP));
}
@Override
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
index f862ab3ae6..1831b7921d 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import javax.jcr.nodetype.NodeDefinitionTemplate;
import javax.jcr.nodetype.NodeTypeTemplate;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -56,7 +56,7 @@ public class CugValidatorTest extends AbstractCugTest {
@NotNull
private Validator createRootValidator(@NotNull NodeState ns) {
- return checkNotNull(new CugValidatorProvider().getRootValidator(ns, ns, new CommitInfo("sid", "uid")));
+ return requireNonNull(new CugValidatorProvider().getRootValidator(ns, ns, new CommitInfo("sid", "uid")));
}
@Test
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
index 79ff34aaf4..58db40bffd 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -167,7 +167,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
IdentifierManager idMgr = new IdentifierManager(testRoot);
for (String path : noReadAccess) {
- String vhUUID = checkNotNull(TreeUtil.getString(root.getTree(path), JCR_VERSIONHISTORY));
+ String vhUUID = requireNonNull(TreeUtil.getString(root.getTree(path), JCR_VERSIONHISTORY));
String vhPath = PathUtils.concat(VERSION_STORE_PATH, versionManager.getVersionHistoryPath(vhUUID));
Tree vHistory = testRoot.getTree(vhPath);
@@ -218,7 +218,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
// cug at /content/a/b/c grants access
Tree versionable = addVersionContent("/content/a/b/c");
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
assertTrue(testRoot.getTree(vh.getPath()).exists());
@@ -242,7 +242,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
// cug at /content/a/b/c denies access
Tree versionable = root.getTree("/content/a");
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
assertFalse(testRoot.getTree(vh.getPath()).exists());
@@ -263,7 +263,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testTreePermissionVersionable() throws Exception {
Tree versionable = root.getTree("/content/a");
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
CugPermissionProvider pp = createCugPermissionProvider(ImmutableSet.of(SUPPORTED_PATH, SUPPORTED_PATH2), EveryonePrincipal.getInstance());
@@ -287,7 +287,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testTreePermissionVersionable2() throws Exception {
Tree versionable = root.getTree("/content");
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
CugPermissionProvider pp = createCugPermissionProvider(ImmutableSet.of(SUPPORTED_PATH, SUPPORTED_PATH2));
@@ -310,7 +310,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testTreePermissionVersionableUnsupportedPath() throws Exception {
Tree versionable = root.getTree(UNSUPPORTED_PATH);
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
CugPermissionProvider pp = createCugPermissionProvider(ImmutableSet.of(SUPPORTED_PATH, SUPPORTED_PATH2));
@@ -331,7 +331,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testTreePermissionAtVersionableAboveSupported() throws Exception {
- Tree vh = checkNotNull(versionManager.getVersionHistory(root.getTree(SUPPORTED_PATH)));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(root.getTree(SUPPORTED_PATH)));
CugPermissionProvider pp = createCugPermissionProvider(ImmutableSet.of(SUPPORTED_PATH + "/a"));
TreePermission tp = getTreePermission(root, vh.getPath(), pp);
@@ -341,7 +341,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testCugAtRoot() throws Exception {
Tree versionable = root.getTree(UNSUPPORTED_PATH);
- String vhPath = checkNotNull(versionManager.getVersionHistory(versionable)).getPath();
+ String vhPath = requireNonNull(versionManager.getVersionHistory(versionable)).getPath();
try {
createCug(root, PathUtils.ROOT_PATH, EveryonePrincipal.NAME);
@@ -371,7 +371,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
@Test
public void testVersionableWithUnsupportedType() throws Exception {
Tree versionable = root.getTree("/content");
- Tree vh = checkNotNull(versionManager.getVersionHistory(versionable));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(versionable));
Tree frozen = vh.getChild("1.0").getChild(JCR_FROZENNODE).getChild("a").getChild("b").getChild("c");
Tree invalidFrozen = frozen.addChild(REP_CUG_POLICY);
@@ -391,7 +391,7 @@ public class VersionTest extends AbstractCugTest implements NodeTypeConstants, V
Tree cc = root.getTree("/content/aa/bb/cc");
assertFalse(CugUtil.hasCug(cc));
- Tree vh = checkNotNull(versionManager.getVersionHistory(cc));
+ Tree vh = requireNonNull(versionManager.getVersionHistory(cc));
Tree t = root.getTree("/");
CugPermissionProvider pp = createCugPermissionProvider(
ImmutableSet.of(SUPPORTED_PATH, SUPPORTED_PATH2), getTestGroupPrincipal());
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java
index f1fb03e5d9..0dfd0ba5ed 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractPrincipalBasedTest.java
@@ -54,7 +54,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NT_OAK_UNSTRUCTURED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -177,7 +177,7 @@ public abstract class AbstractPrincipalBasedTest extends AbstractSecurityTest {
boolean addDefaultEntry(@Nullable String path, @NotNull Principal principal, @Nullable Map<String, Value> restr, @Nullable Map<String, Value[]> mvRestr, @NotNull String... privNames) throws Exception {
JackrabbitAccessControlManager jacm = getAccessControlManager(root);
JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(jacm, path);
- checkNotNull(acl);
+ requireNonNull(acl);
boolean mod = acl.addEntry(principal, privilegesFromNames(privNames), true, restr, mvRestr);
jacm.setPolicy(acl.getPath(), acl);
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionTest.java
index 09af79fafa..f8d996b7c2 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import java.security.Principal;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static javax.jcr.Session.ACTION_READ;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
@@ -108,7 +108,7 @@ public class PermissionProviderVersionTest extends AbstractPrincipalBasedTest {
} else {
path = new IdentifierManager(root).getPath(versionable.getProperty(JCR_BASEVERSION));
}
- checkNotNull(path);
+ requireNonNull(path);
return path;
}
@@ -122,7 +122,7 @@ public class PermissionProviderVersionTest extends AbstractPrincipalBasedTest {
reference = versionable.getProperty(JCR_BASEVERSION);
}
Tree t = new IdentifierManager(root).getTree(reference.getValue(Type.STRING));
- checkNotNull(t);
+ requireNonNull(t);
return t;
}
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/VersionTreePermissionTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/VersionTreePermissionTest.java
index 29cdc846ef..dbe2d6b3f0 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/VersionTreePermissionTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/VersionTreePermissionTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import java.security.Principal;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENNODE;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
@@ -101,7 +101,7 @@ public class VersionTreePermissionTest extends AbstractPrincipalBasedTest {
private String getPathFromReference(@NotNull String treePath, @NotNull String refProperty) {
Tree tree = root.getTree(treePath);
String path = new IdentifierManager(root).getPath(tree.getProperty(refProperty));
- checkNotNull(path);
+ requireNonNull(path);
return path;
}
diff --git a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
index 645d43e2d0..6abac4b191 100644
--- a/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
+++ b/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
public class ElasticGlobalInitializer implements RepositoryInitializer {
@@ -92,7 +92,7 @@ public class ElasticGlobalInitializer implements RepositoryInitializer {
* @return
*/
public ElasticGlobalInitializer async(@NotNull final String async) {
- this.async = checkNotNull(async);
+ this.async = requireNonNull(async);
return this;
}
diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
index 12d11ac83c..340990d9fd 100644
--- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
+++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
@@ -92,7 +92,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
@@ -401,7 +401,7 @@ public class HybridIndexTest extends AbstractTest<HybridIndexTest.TestContext> {
}
private void runAsyncIndex() {
- checkNotNull(getAsyncIndexUpdate()).run();
+ requireNonNull(getAsyncIndexUpdate()).run();
}
private AsyncIndexUpdate getAsyncIndexUpdate() {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
index d74187e7fe..8b3465c72a 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CompositeAuthorizationTest.java
@@ -59,7 +59,7 @@ import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Test the effect of multiple authorization configurations on the general read
@@ -97,7 +97,7 @@ public class CompositeAuthorizationTest extends ReadDeepTreeTest {
throw new IllegalStateException();
} else {
CompositeAuthorizationConfiguration composite = (CompositeAuthorizationConfiguration) authorizationConfiguration;
- final AuthorizationConfiguration defConfig = checkNotNull(composite.getDefaultConfig());
+ final AuthorizationConfiguration defConfig = requireNonNull(composite.getDefaultConfig());
for (int i = 0; i < cnt; i++) {
composite.addConfiguration(new TmpAuthorizationConfig(defConfig));
}
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
index 01893b38a9..55f723c084 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/CugTest.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfigu
import org.apache.jackrabbit.oak.spi.security.authorization.cug.impl.CugConfiguration;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Test the effect of multiple authorization configurations on the general read
@@ -86,7 +86,7 @@ public class CugTest extends ReadDeepTreeTest {
SecurityProvider delegate = SecurityProviderBuilder.newBuilder().with(params).build();
CompositeAuthorizationConfiguration authorizationConfiguration = (CompositeAuthorizationConfiguration) delegate
.getConfiguration((AuthorizationConfiguration.class));
- AuthorizationConfiguration defaultAuthorization = checkNotNull(authorizationConfiguration.getDefaultConfig());
+ AuthorizationConfiguration defaultAuthorization = requireNonNull(authorizationConfiguration.getDefaultConfig());
if (reverseOrder) {
authorizationConfiguration.addConfiguration(defaultAuthorization);
authorizationConfiguration.addConfiguration(new CugConfiguration(delegate));
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
index 0f5884c338..f599c3488b 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java
@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -232,7 +232,7 @@ public class PropertyFullTextTest extends AbstractTest<PropertyFullTextTest.Test
public TestContext(@NotNull final String title) {
LOG.trace("Setting title - {} for test context", title);
- this.title = checkNotNull(title);
+ this.title = requireNonNull(title);
}
}
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
index 4c9954cdd4..b9aa2114b2 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
@@ -59,7 +59,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static javax.jcr.security.Privilege.JCR_ALL;
public class PrinicipalBasedReadTest extends ReadDeepTreeTest {
@@ -220,7 +220,7 @@ public class PrinicipalBasedReadTest extends ReadDeepTreeTest {
CompositeAuthorizationConfiguration authorizationConfiguration = (CompositeAuthorizationConfiguration) delegate
.getConfiguration((AuthorizationConfiguration.class));
authorizationConfiguration.withCompositionType(compositionType);
- AuthorizationConfiguration defaultAuthorization = checkNotNull(authorizationConfiguration.getDefaultConfig());
+ AuthorizationConfiguration defaultAuthorization = requireNonNull(authorizationConfiguration.getDefaultConfig());
if (testDefault) {
authorizationConfiguration.addConfiguration(defaultAuthorization);
} else {
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
index 3a076a5d72..f904621741 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.blob;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.System.nanoTime;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.formatTime;
@@ -72,8 +72,8 @@ public class BlobGC extends AnnotatedStandardMBean implements BlobGCMBean {
@NotNull BlobGarbageCollector blobGarbageCollector,
@NotNull Executor executor) {
super(BlobGCMBean.class);
- this.blobGarbageCollector = checkNotNull(blobGarbageCollector);
- this.executor = checkNotNull(executor);
+ this.blobGarbageCollector = requireNonNull(blobGarbageCollector);
+ this.executor = requireNonNull(executor);
}
@NotNull
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java
index 45836c8386..6f63625648 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.blob;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import java.util.concurrent.TimeUnit;
@@ -225,7 +225,7 @@ public class BlobStoreStats extends AnnotatedStandardMBean implements BlobStoreS
public BlobStoreStats(@NotNull StatisticsProvider sp) {
super(BlobStoreStatsMBean.class);
- this.statisticsProvider = checkNotNull(sp);
+ this.statisticsProvider = requireNonNull(sp);
this.uploadHisto = sp.getHistogram(BLOB_UPLOADS, StatsOptions.DEFAULT);
this.uploadCount = sp.getMeter(BLOB_UPLOAD_COUNT, StatsOptions.DEFAULT);
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
index 078f058801..099d7e4574 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.blob;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static java.io.File.createTempFile;
import static java.util.Comparator.comparing;
@@ -190,7 +190,7 @@ public class MarkSweepGarbageCollector implements BlobGarbageCollector {
this.blobStore = blobStore;
this.checkConsistencyAfterGc = checkConsistencyAfterGc;
this.sweepIfRefsPastRetention = sweepIfRefsPastRetention;
- checkNotNull(blobStore, "BlobStore cannot be null");
+ requireNonNull(blobStore, "BlobStore cannot be null");
this.marker = marker;
this.batchCount = batchCount;
this.maxLastModifiedInterval = maxLastModifiedInterval;
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
index b923567733..8d953bf5d8 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/cloud/CloudBlobStore.java
@@ -22,8 +22,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.Preconditions;
+import java.util.Objects;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.commons.StringUtils;
@@ -119,7 +120,7 @@ public class CloudBlobStore extends CachingBlobStore {
*/
@Override
protected void storeBlock(byte[] digest, int level, byte[] data) throws IOException {
- Preconditions.checkNotNull(context);
+ Objects.requireNonNull(context);
String id = StringUtils.convertBytesToHex(digest);
cache.put(id, data);
@@ -146,7 +147,7 @@ public class CloudBlobStore extends CachingBlobStore {
*/
@Override
protected byte[] readBlockFromBackend(BlockId blockId) throws Exception {
- Preconditions.checkNotNull(context);
+ Objects.requireNonNull(context);
String id = StringUtils.convertBytesToHex(blockId.getDigest());
byte[] data = cache.get(id);
@@ -183,7 +184,7 @@ public class CloudBlobStore extends CachingBlobStore {
*
*/
public void deleteBucket() {
- Preconditions.checkNotNull(context);
+ Objects.requireNonNull(context);
if (context.getBlobStore().containerExists(cloudContainer)) {
context.getBlobStore().deleteContainer(cloudContainer);
@@ -214,7 +215,7 @@ public class CloudBlobStore extends CachingBlobStore {
@Override
public Iterator<String> getAllChunkIds(
long maxLastModifiedTime) throws Exception {
- Preconditions.checkNotNull(context);
+ Objects.requireNonNull(context);
final org.jclouds.blobstore.BlobStore blobStore = context.getBlobStore();
return new CloudStoreIterator(blobStore, maxLastModifiedTime);
@@ -222,7 +223,7 @@ public class CloudBlobStore extends CachingBlobStore {
@Override
public long countDeleteChunks(List<String> chunkIds, long maxLastModifiedTime) throws Exception {
- Preconditions.checkNotNull(context);
+ Objects.requireNonNull(context);
long count = 0;
for (String chunkId : chunkIds) {
final org.jclouds.blobstore.BlobStore blobStore = context.getBlobStore();
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
index d057007bc5..ead94ed535 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.blob.datastore;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterators.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
import static org.apache.commons.io.IOUtils.closeQuietly;
@@ -332,7 +332,7 @@ public class DataStoreBlobStore
try {
long start = System.nanoTime();
- checkNotNull(stream);
+ requireNonNull(stream);
DataRecord dr = writeStream(stream, options);
String id = getBlobId(dr);
updateTracker(id);
@@ -384,7 +384,7 @@ public class DataStoreBlobStore
@Override
public long getBlobLength(String encodedBlobId) throws IOException {
try {
- checkNotNull(encodedBlobId, "BlobId must be specified");
+ requireNonNull(encodedBlobId, "BlobId must be specified");
BlobId id = BlobId.of(encodedBlobId);
if (encodeLengthInId && id.hasLengthInfo()) {
return id.length;
@@ -397,7 +397,7 @@ public class DataStoreBlobStore
@Override
public String getBlobId(@NotNull String reference) {
- checkNotNull(reference);
+ requireNonNull(reference);
DataRecord record;
try {
record = delegate.getRecordFromReference(reference);
@@ -412,7 +412,7 @@ public class DataStoreBlobStore
@Override
public String getReference(@NotNull String encodedBlobId) {
- checkNotNull(encodedBlobId);
+ requireNonNull(encodedBlobId);
String blobId = extractBlobId(encodedBlobId);
//Reference are not created for in memory record
if (InMemoryDataRecord.isInstance(blobId)) {
@@ -911,7 +911,7 @@ public class DataStoreBlobStore
} else {
id = delegate.getRecord(new DataIdentifier(blobId));
}
- checkNotNull(id, "No DataRecord found for blobId [%s]", blobId);
+ requireNonNull(id, String.format("No DataRecord found for blobId [%s]", blobId));
return id;
}
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
index 901e9308eb..0d36e8af26 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/FileDataStoreService.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.blob.datastore;
-import org.apache.jackrabbit.guava.common.base.Preconditions;
+import java.util.Objects;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
@@ -63,7 +63,7 @@ public class FileDataStoreService extends AbstractDataStoreService {
// return CachingFDS when cacheSize > 0
if (cacheSize > 0) {
String fsBackendPath = PropertiesUtil.toString(config.get(PATH), null);
- Preconditions.checkNotNull(fsBackendPath, "Cannot create " +
+ Objects.requireNonNull(fsBackendPath, "Cannot create " +
"FileDataStoreService with caching. [{path}] property not configured.");
config.remove(PATH);
diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
index 58ce19e529..3db6800029 100644
--- a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
+++ b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStore.java
@@ -55,7 +55,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* An abstract data store that splits the binaries in relatively small blocks,
@@ -232,7 +232,7 @@ public abstract class AbstractBlobStore implements GarbageCollectableBlobStore,
@Override
public String getReference(@NotNull String blobId) {
- checkNotNull(blobId, "BlobId must be specified");
+ requireNonNull(blobId, "BlobId must be specified");
try {
Mac mac = Mac.getInstance(ALGORITHM);
mac.init(new SecretKeySpec(getReferenceKey(), ALGORITHM));
@@ -249,7 +249,7 @@ public abstract class AbstractBlobStore implements GarbageCollectableBlobStore,
@Override
public String getBlobId(@NotNull String reference) {
- checkNotNull(reference, "BlobId must be specified");
+ requireNonNull(reference, "BlobId must be specified");
int colon = reference.indexOf(':');
if (colon != -1) {
String blobId = reference.substring(0, colon);
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
index db9c766a1a..69b360b199 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.commons;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -42,7 +42,7 @@ public class StringUtils {
*/
@NotNull
public static String convertBytesToHex(@NotNull byte[] value) {
- checkNotNull(value);
+ requireNonNull(value);
int len = value.length;
char[] buff = new char[len + len];
char[] hex = HEX;
@@ -62,7 +62,7 @@ public class StringUtils {
*/
@NotNull
public static byte[] convertHexToBytes(@NotNull String s) {
- checkNotNull(s);
+ requireNonNull(s);
int len = s.length();
checkArgument(len % 2 == 0);
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
index 8f92782403..0f2a3e6abb 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
@@ -30,7 +30,7 @@ import java.util.TreeSet;
import org.apache.jackrabbit.guava.common.base.Function;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.newTreeSet;
@@ -62,7 +62,7 @@ public final class MountInfo implements Mount {
public MountInfo(String name, boolean readOnly, List<String> pathsSupportingFragments,
List<String> includedPaths) {
- this.name = checkNotNull(name, "Mount name must not be null");
+ this.name = requireNonNull(name, "Mount name must not be null");
this.readOnly = readOnly;
this.pathFragmentName = "oak:mount-" + name;
this.includedPaths = cleanCopy(includedPaths);
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
index cafe718662..86d6b3ff4d 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/AbstractServiceTracker.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.spi.whiteboard;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static java.util.Collections.emptyList;
@@ -64,12 +64,12 @@ public abstract class AbstractServiceTracker<T> {
private volatile Tracker<T> tracker = stopped;
protected AbstractServiceTracker(@NotNull Class<T> type) {
- this.type = checkNotNull(type);
+ this.type = requireNonNull(type);
this.filterProperties = null;
}
protected AbstractServiceTracker(@NotNull Class<T> type, @NotNull Map<String, String> filterProperties) {
- this.type = checkNotNull(type);
+ this.type = requireNonNull(type);
this.filterProperties = filterProperties;
}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
index 77e5f95b8a..bf4f3057fc 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.spi.whiteboard;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newIdentityHashSet;
import static java.util.Collections.emptyList;
@@ -81,8 +81,8 @@ public class DefaultWhiteboard implements Whiteboard {
@Override
public <T> Registration register(
final Class<T> type, final T service, Map<?, ?> properties) {
- checkNotNull(type);
- checkNotNull(service);
+ requireNonNull(type);
+ requireNonNull(service);
checkArgument(type.isInstance(service));
Service s = new Service(service, properties);
@@ -98,7 +98,7 @@ public class DefaultWhiteboard implements Whiteboard {
@Override
public <T> Tracker<T> track(final Class<T> type) {
- checkNotNull(type);
+ requireNonNull(type);
return new Tracker<T>() {
@Override
public List<T> getServices() {
@@ -113,7 +113,7 @@ public class DefaultWhiteboard implements Whiteboard {
@Override
public <T> Tracker<T> track(Class<T> type, Map<String, String> filterProperties) {
- checkNotNull(type);
+ requireNonNull(type);
return new Tracker<T>() {
@Override
public List<T> getServices() {
@@ -132,7 +132,7 @@ public class DefaultWhiteboard implements Whiteboard {
private final Map<?, ?> properties;
private Service(@NotNull Object service, Map<?, ?> properties) {
- checkNotNull(service);
+ requireNonNull(service);
this.service = service;
this.properties = properties;
}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/StopwatchLogger.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/StopwatchLogger.java
index abd4ffa1e1..830885dfce 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/StopwatchLogger.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/StopwatchLogger.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.stats;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import java.io.Closeable;
@@ -49,7 +49,7 @@ public class StopwatchLogger implements Closeable {
* @param clazz
*/
public StopwatchLogger(@NotNull final String clazz) {
- this(null, checkNotNull(clazz));
+ this(null, requireNonNull(clazz));
}
/**
@@ -58,7 +58,7 @@ public class StopwatchLogger implements Closeable {
* @param clazz
*/
public StopwatchLogger(@NotNull final Class<?> clazz) {
- this(checkNotNull(clazz).getName().toString());
+ this(requireNonNull(clazz).getName().toString());
}
/**
@@ -69,7 +69,7 @@ public class StopwatchLogger implements Closeable {
* @param clazz
*/
public StopwatchLogger(@Nullable final Logger customLog, @NotNull final Class<?> clazz) {
- this(customLog, checkNotNull(clazz).getName().toString());
+ this(customLog, requireNonNull(clazz).getName().toString());
}
/**
@@ -80,7 +80,7 @@ public class StopwatchLogger implements Closeable {
* @param clazz
*/
public StopwatchLogger(@Nullable final Logger customLog, @NotNull final String clazz) {
- this.clazz = checkNotNull(clazz);
+ this.clazz = requireNonNull(clazz);
this.customLog = customLog;
}
@@ -122,7 +122,7 @@ public class StopwatchLogger implements Closeable {
private static void track(@NotNull final StopwatchLogger swl,
@Nullable final String message) {
- checkNotNull(swl);
+ requireNonNull(swl);
if (swl.isEnabled()) {
Logger l = swl.getLogger();
@@ -134,7 +134,7 @@ public class StopwatchLogger implements Closeable {
l.debug(
"{} - {} {}ms",
- new Object[] { checkNotNull(swl.clazz), message == null ? "" : message,
+ new Object[] { requireNonNull(swl.clazz), message == null ? "" : message,
c.getTimeMonotonic() - swl.start});
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
index 4f2beb318d..0428b8ebc4 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static java.util.Collections.emptyMap;
@@ -368,7 +368,7 @@ public class Oak {
private boolean failOnMissingIndexProvider;
public Oak(NodeStore store) {
- this.store = checkNotNull(store);
+ this.store = requireNonNull(store);
}
public Oak() {
@@ -385,7 +385,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull Clusterable c) {
- this.clusterable = checkNotNull(c);
+ this.clusterable = requireNonNull(c);
return this;
}
@@ -399,13 +399,13 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull String defaultWorkspaceName) {
- this.defaultWorkspaceName = checkNotNull(defaultWorkspaceName);
+ this.defaultWorkspaceName = requireNonNull(defaultWorkspaceName);
return this;
}
@NotNull
public Oak with(@NotNull RepositoryInitializer initializer) {
- initializers.add(checkNotNull(initializer));
+ initializers.add(requireNonNull(initializer));
return this;
}
@@ -428,7 +428,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull QueryIndexProvider provider) {
- queryIndexProviders.add(checkNotNull(provider));
+ queryIndexProviders.add(requireNonNull(provider));
return this;
}
@@ -441,7 +441,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull IndexEditorProvider provider) {
- indexEditorProviders.add(checkNotNull(provider));
+ indexEditorProviders.add(requireNonNull(provider));
return this;
}
@@ -453,7 +453,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull CommitHook hook) {
- checkNotNull(hook);
+ requireNonNull(hook);
withEditorHook();
commitHooks.add(hook);
return this;
@@ -483,7 +483,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull EditorProvider provider) {
- editorProviders.add(checkNotNull(provider));
+ editorProviders.add(requireNonNull(provider));
return this;
}
@@ -495,7 +495,7 @@ public class Oak {
*/
@NotNull
public Oak with(@NotNull final Editor editor) {
- checkNotNull(editor);
+ requireNonNull(editor);
return with(new EditorProvider() {
@Override @NotNull
public Editor getRootEditor(
@@ -508,7 +508,7 @@ public class Oak {
@NotNull
public Oak with(@NotNull SecurityProvider securityProvider) {
- this.securityProvider = checkNotNull(securityProvider);
+ this.securityProvider = requireNonNull(securityProvider);
return this;
}
@@ -527,7 +527,7 @@ public class Oak {
@NotNull
public Oak with(@NotNull ThreeWayConflictHandler conflictHandler) {
- checkNotNull(conflictHandler);
+ requireNonNull(conflictHandler);
withEditorHook();
if (this.conflictHandler == null) {
@@ -546,25 +546,25 @@ public class Oak {
@NotNull
public Oak with(@NotNull ScheduledExecutorService scheduledExecutor) {
- this.scheduledExecutor = checkNotNull(scheduledExecutor);
+ this.scheduledExecutor = requireNonNull(scheduledExecutor);
return this;
}
@NotNull
public Oak with(@NotNull Executor executor) {
- this.executor = checkNotNull(executor);
+ this.executor = requireNonNull(executor);
return this;
}
@NotNull
public Oak with(@NotNull MBeanServer mbeanServer) {
- this.mbeanServer = checkNotNull(mbeanServer);
+ this.mbeanServer = requireNonNull(mbeanServer);
return this;
}
@NotNull
public Oak with(@NotNull Whiteboard whiteboard) {
- this.whiteboard = checkNotNull(whiteboard);
+ this.whiteboard = requireNonNull(whiteboard);
QueryEngineSettings whiteboardSettings = WhiteboardUtils.getService(whiteboard, QueryEngineSettings.class);
if (whiteboardSettings != null) {
queryEngineSettings = new AnnotatedQueryEngineSettings(whiteboardSettings);
@@ -592,7 +592,7 @@ public class Oak {
@NotNull
public Oak with(@NotNull Observer observer) {
- observers.add(checkNotNull(observer));
+ observers.add(requireNonNull(observer));
return this;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
index 23befbf8f4..a701dacc1e 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static javax.jcr.Repository.IDENTIFIER_STABILITY;
import static javax.jcr.Repository.LEVEL_1_SUPPORTED;
import static javax.jcr.Repository.LEVEL_2_SUPPORTED;
@@ -142,10 +142,10 @@ public class ContentRepositoryImpl implements ContentRepository, Closeable {
@NotNull SecurityProvider securityProvider,
@Nullable Descriptors baseDescriptors,
@Nullable Feature classicMove) {
- this.nodeStore = checkNotNull(nodeStore);
- this.commitHook = checkNotNull(commitHook);
- this.defaultWorkspaceName = checkNotNull(defaultWorkspaceName);
- this.securityProvider = checkNotNull(securityProvider);
+ this.nodeStore = requireNonNull(nodeStore);
+ this.commitHook = requireNonNull(commitHook);
+ this.defaultWorkspaceName = requireNonNull(defaultWorkspaceName);
+ this.securityProvider = requireNonNull(securityProvider);
this.queryEngineSettings = queryEngineSettings != null ? queryEngineSettings : new QueryEngineSettings();
this.indexProvider = indexProvider != null ? indexProvider : new CompositeQueryIndexProvider();
this.baseDescriptors = baseDescriptors;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
index c209115167..2e21b48aba 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
@@ -162,14 +162,14 @@ class MutableRoot implements Root, PermissionAware {
QueryIndexProvider indexProvider,
Feature classicMove,
ContentSessionImpl session) {
- this.store = checkNotNull(store);
- this.hook = checkNotNull(hook);
- this.workspaceName = checkNotNull(workspaceName);
- this.subject = checkNotNull(subject);
- this.securityProvider = checkNotNull(securityProvider);
+ this.store = requireNonNull(store);
+ this.hook = requireNonNull(hook);
+ this.workspaceName = requireNonNull(workspaceName);
+ this.subject = requireNonNull(subject);
+ this.securityProvider = requireNonNull(securityProvider);
this.queryEngineSettings = queryEngineSettings;
this.indexProvider = indexProvider;
- this.session = checkNotNull(session);
+ this.session = requireNonNull(session);
this.lastMove = createMove(classicMove);
builder = store.getRoot().builder();
@@ -197,7 +197,7 @@ class MutableRoot implements Root, PermissionAware {
@Override
public boolean move(String sourcePath, String destPath) {
- if (isAncestor(checkNotNull(sourcePath), checkNotNull(destPath))) {
+ if (isAncestor(requireNonNull(sourcePath), requireNonNull(destPath))) {
return false;
} else if (sourcePath.equals(destPath)) {
return true;
@@ -343,7 +343,7 @@ class MutableRoot implements Root, PermissionAware {
@Override @NotNull
public Blob createBlob(@NotNull InputStream inputStream) throws IOException {
checkLive();
- return store.createBlob(checkNotNull(inputStream));
+ return store.createBlob(requireNonNull(inputStream));
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
index 5b579aca9b..28b4b9be27 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.core;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
@@ -61,11 +61,11 @@ final class MutableTree extends AbstractMutableTree {
private MutableTree(@NotNull MutableRoot root, @NotNull Move pendingMoves,
@Nullable MutableTree parent, @NotNull NodeBuilder nodeBuilder, @NotNull String name) {
- this.root = checkNotNull(root);
+ this.root = requireNonNull(root);
this.parent = parent;
- this.name = checkNotNull(name);
+ this.name = requireNonNull(name);
this.nodeBuilder = nodeBuilder;
- this.pendingMoves = checkNotNull(pendingMoves);
+ this.pendingMoves = requireNonNull(pendingMoves);
}
//------------------------------------------------------------< AbstractMutableTree >---
@@ -88,7 +88,7 @@ final class MutableTree extends AbstractMutableTree {
@NotNull
protected MutableTree createChild(@NotNull String name) throws IllegalArgumentException {
return new MutableTree(root, pendingMoves, this,
- nodeBuilder.getChildNode(checkNotNull(name)), name);
+ nodeBuilder.getChildNode(requireNonNull(name)), name);
}
//------------------------------------------------------------< Tree >---
@@ -123,13 +123,13 @@ final class MutableTree extends AbstractMutableTree {
@Override
public PropertyState getProperty(@NotNull String name) {
beforeRead();
- return super.getProperty(checkNotNull(name));
+ return super.getProperty(requireNonNull(name));
}
@Override
public boolean hasProperty(@NotNull String name) {
beforeRead();
- return super.hasProperty(checkNotNull(name));
+ return super.hasProperty(requireNonNull(name));
}
@Override
@@ -142,7 +142,7 @@ final class MutableTree extends AbstractMutableTree {
@Nullable
public Status getPropertyStatus(@NotNull String name) {
beforeRead();
- return super.getPropertyStatus(checkNotNull(name));
+ return super.getPropertyStatus(requireNonNull(name));
}
@Override
@@ -156,13 +156,13 @@ final class MutableTree extends AbstractMutableTree {
@NotNull
public Tree getChild(@NotNull String name) {
beforeRead();
- return super.getChild(checkNotNull(name));
+ return super.getChild(requireNonNull(name));
}
@Override
public boolean hasChild(@NotNull String name) {
beforeRead();
- return super.hasChild(checkNotNull(name));
+ return super.hasChild(requireNonNull(name));
}
@Override
@@ -253,8 +253,8 @@ final class MutableTree extends AbstractMutableTree {
* @param name name of this tree
*/
void setParentAndName(@NotNull MutableTree parent, @NotNull String name) {
- this.name = checkNotNull(name);
- this.parent = checkNotNull(parent);
+ this.name = requireNonNull(name);
+ this.parent = requireNonNull(parent);
}
/**
@@ -264,8 +264,8 @@ final class MutableTree extends AbstractMutableTree {
* @param newName new name for this tree
*/
boolean moveTo(@NotNull MutableTree newParent, @NotNull String newName) {
- checkNotNull(newName);
- checkNotNull(newParent);
+ requireNonNull(newName);
+ requireNonNull(newParent);
MutableTree oldParent = parent;
boolean success = nodeBuilder.moveTo(newParent.nodeBuilder, newName);
if (success) {
@@ -284,7 +284,7 @@ final class MutableTree extends AbstractMutableTree {
*/
@NotNull
MutableTree getTree(@NotNull String path) {
- checkArgument(isAbsolute(checkNotNull(path)));
+ checkArgument(isAbsolute(requireNonNull(path)));
beforeRead();
MutableTree child = this;
for (String name : elements(path)) {
@@ -307,7 +307,7 @@ final class MutableTree extends AbstractMutableTree {
@Override
protected void buildPath(@NotNull StringBuilder sb) {
if (parent != null) {
- parent.buildPath(checkNotNull(sb));
+ parent.buildPath(requireNonNull(sb));
sb.append('/').append(name);
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
index 8acfcedf33..2c1f7a6762 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
@@ -99,8 +99,8 @@ class SecureNodeBuilder implements NodeBuilder {
this.rootBuilder = this;
this.parent = null;
this.name = null;
- this.permissionProvider = checkNotNull(permissionProvider);
- this.builder = checkNotNull(builder);
+ this.permissionProvider = requireNonNull(permissionProvider);
+ this.builder = requireNonNull(builder);
}
private SecureNodeBuilder(SecureNodeBuilder parent, String name) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
index 51a772fc10..3f57703a8d 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static java.util.Collections.emptyList;
@@ -51,8 +51,8 @@ class SecureNodeState extends AbstractNodeState {
private long propertyCount = -1;
SecureNodeState(@NotNull NodeState state, @NotNull TreePermission treePermission) {
- this.state = checkNotNull(state);
- this.treePermission = checkNotNull(treePermission);
+ this.state = requireNonNull(state);
+ this.treePermission = requireNonNull(treePermission);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
index 4ecf4c6740..c27db088a6 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.management;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static java.util.Collections.singletonMap;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status;
@@ -60,7 +60,7 @@ public class RepositoryManager extends AnnotatedStandardMBean implements Reposit
public RepositoryManager(@NotNull Whiteboard whiteboard) {
super(RepositoryManagementMBean.class);
- this.whiteboard = checkNotNull(whiteboard);
+ this.whiteboard = requireNonNull(whiteboard);
}
public String getName() {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
index afb8cbb1ca..cd9098df6e 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.namepath.impl;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -116,7 +116,7 @@ public class GlobalNameMapper implements NameMapper {
@Override @NotNull
public String getJcrName(@NotNull String oakName) {
// Sanity checks, can be turned to assertions if needed for performance
- checkNotNull(oakName);
+ requireNonNull(oakName);
checkArgument(!isHiddenName(oakName), oakName);
checkArgument(!isExpandedName(oakName), oakName);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
index 6eb8d697f4..0f68f0e009 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.namepath.impl;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.Map;
@@ -54,7 +54,7 @@ public class LocalNameMapper extends GlobalNameMapper {
@Override @NotNull
public synchronized String getJcrName(@NotNull String oakName) {
- checkNotNull(oakName);
+ requireNonNull(oakName);
checkArgument(!oakName.startsWith(":"), oakName); // hidden name
checkArgument(!isExpandedName(oakName), oakName); // expanded name
@@ -99,7 +99,7 @@ public class LocalNameMapper extends GlobalNameMapper {
@Override @Nullable
public synchronized String getOakNameOrNull(@NotNull String jcrName) {
- checkNotNull(jcrName);
+ requireNonNull(jcrName);
if (jcrName.startsWith("{")) {
String oakName = getOakNameFromExpanded(jcrName);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
index cc2cdd2892..59db31b70f 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.atomic;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
@@ -194,7 +194,7 @@ public class AtomicCounterEditor extends DefaultEditor {
@Nullable ScheduledExecutorService executor,
@Nullable NodeStore store,
@Nullable Whiteboard board) {
- this("", checkNotNull(builder), instanceId, executor, store, board);
+ this("", requireNonNull(builder), instanceId, executor, store, board);
}
private AtomicCounterEditor(final String path,
@@ -203,7 +203,7 @@ public class AtomicCounterEditor extends DefaultEditor {
@Nullable ScheduledExecutorService executor,
@Nullable NodeStore store,
@Nullable Whiteboard board) {
- this.builder = checkNotNull(builder);
+ this.builder = requireNonNull(builder);
this.path = path;
this.instanceId = Strings.isNullOrEmpty(instanceId) ? null : instanceId;
this.executor = executor;
@@ -221,7 +221,7 @@ public class AtomicCounterEditor extends DefaultEditor {
final String path,
final NodeBuilder builder) {
boolean process = false;
- PropertyState mixin = checkNotNull(builder).getProperty(JCR_MIXINTYPES);
+ PropertyState mixin = requireNonNull(builder).getProperty(JCR_MIXINTYPES);
if (mixin != null && PROP_INCREMENT.equals(property.getName()) &&
Iterators.contains(mixin.getValue(NAMES).iterator(), MIX_ATOMIC_COUNTER)) {
if (LONG.equals(property.getType())) {
@@ -363,17 +363,17 @@ public class AtomicCounterEditor extends DefaultEditor {
long delay,
@NotNull CommitHook hook) {
this.start = System.currentTimeMillis();
- p = checkNotNull(path);
+ p = requireNonNull(path);
rev = revision;
- s = checkNotNull(store);
- this.exec = checkNotNull(exec);
+ s = requireNonNull(store);
+ this.exec = requireNonNull(exec);
this.delay = delay;
- this.hook = checkNotNull(hook);
+ this.hook = requireNonNull(hook);
this.name = UUID.randomUUID().toString();
}
private ConsolidatorTask(@NotNull ConsolidatorTask task, long delay) {
- checkNotNull(task);
+ requireNonNull(task);
this.p = task.p;
this.rev = task.rev;
this.s = task.s;
@@ -431,7 +431,7 @@ public class AtomicCounterEditor extends DefaultEditor {
private void dumpNode(@NotNull NodeBuilder b, String path) {
if (LOG.isTraceEnabled()) {
- checkNotNull(b);
+ requireNonNull(b);
StringBuilder s = new StringBuilder();
for (PropertyState p : b.getProperties()) {
s.append(p).append("\n");
@@ -504,8 +504,8 @@ public class AtomicCounterEditor extends DefaultEditor {
}
private static NodeBuilder builderFromPath(@NotNull NodeBuilder ancestor, @NotNull String path) {
- NodeBuilder b = checkNotNull(ancestor);
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ NodeBuilder b = requireNonNull(ancestor);
+ for (String name : PathUtils.elements(requireNonNull(path))) {
b = b.getChildNode(name);
}
return b;
@@ -520,7 +520,7 @@ public class AtomicCounterEditor extends DefaultEditor {
* @return true if the sum of the hidden counters does not match the exposed one.
*/
static boolean isConsolidate(@NotNull NodeBuilder b) {
- checkNotNull(b);
+ requireNonNull(b);
PropertyState counter = b.getProperty(PROP_COUNTER);
if (counter == null) {
counter = LongPropertyState.createLongProperty(PROP_COUNTER, 0);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java
index b74f65672b..b5e85d2bbd 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexInfo.java
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index;
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class AsyncIndexInfo {
private final String name;
@@ -32,7 +32,7 @@ public class AsyncIndexInfo {
private final IndexStatsMBean statsMBean;
public AsyncIndexInfo(String name, long lastIndexedTo, long leaseExpiryTime, boolean running, @Nullable IndexStatsMBean statsMBean) {
- this.name = checkNotNull(name);
+ this.name = requireNonNull(name);
this.lastIndexedTo = lastIndexedTo;
this.leaseExpiryTime = leaseExpiryTime;
this.running = running;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
index 83fb5282ac..fde1f9e537 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Throwables.getStackTraceAsString;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_DONE;
@@ -225,8 +225,8 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
@NotNull IndexEditorProvider provider, StatisticsProvider statsProvider, boolean switchOnSync) {
this.name = checkValidName(name);
this.lastIndexedTo = lastIndexedTo(name);
- this.store = checkNotNull(store);
- this.provider = checkNotNull(provider);
+ this.store = requireNonNull(store);
+ this.provider = requireNonNull(provider);
this.switchOnSync = switchOnSync;
this.leaseTimeOut = DEFAULT_ASYNC_TIMEOUT;
this.statisticsProvider = statsProvider;
@@ -240,7 +240,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
}
public static String checkValidName(String asyncName){
- checkNotNull(asyncName, "async name should not be null");
+ requireNonNull(asyncName, "async name should not be null");
if (IndexConstants.ASYNC_REINDEX_VALUE.equals(asyncName)){
return asyncName;
}
@@ -423,7 +423,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
}
public void setValidatorProviders(List<ValidatorProvider> validatorProviders) {
- this.validatorProviders = checkNotNull(validatorProviders);
+ this.validatorProviders = requireNonNull(validatorProviders);
}
private void checkIfStopped() throws CommitFailedException {
@@ -705,7 +705,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
}
private static NodeBuilder childBuilder(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
@@ -982,11 +982,11 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
}
public void setValidatorProviders(List<ValidatorProvider> validatorProviders) {
- this.validatorProviders = checkNotNull(validatorProviders);
+ this.validatorProviders = requireNonNull(validatorProviders);
}
public void setCorruptIndexHandler(TrackingCorruptIndexHandler corruptIndexHandler) {
- this.corruptIndexHandler = checkNotNull(corruptIndexHandler);
+ this.corruptIndexHandler = requireNonNull(corruptIndexHandler);
}
TrackingCorruptIndexHandler getCorruptIndexHandler() {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java
index c263bc767a..0b1c516450 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java
@@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.notNull;
@Component
@@ -123,7 +123,7 @@ public class IndexInfoServiceImpl implements IndexInfoService{
service = IndexInfoProvider.class
)
public void bindInfoProviders(IndexInfoProvider infoProvider){
- infoProviders.put(checkNotNull(infoProvider.getType()), infoProvider);
+ infoProviders.put(requireNonNull(infoProvider.getType()), infoProvider);
}
public void unbindInfoProviders(IndexInfoProvider infoProvider){
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
index fb2217dc34..ee8ddce1f7 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
@@ -161,14 +161,14 @@ public class IndexUpdate implements Editor, PathSource {
this.name = null;
this.path = "/";
this.rootState = new IndexUpdateRootState(provider, async, root, builder, updateCallback, traversalCallback, commitInfo, corruptIndexHandler);
- this.builder = checkNotNull(builder);
+ this.builder = requireNonNull(builder);
}
private IndexUpdate(IndexUpdate parent, String name) {
- this.parent = checkNotNull(parent);
+ this.parent = requireNonNull(parent);
this.name = name;
this.rootState = parent.rootState;
- this.builder = parent.builder.getChildNode(checkNotNull(name));
+ this.builder = parent.builder.getChildNode(requireNonNull(name));
}
@Override
@@ -636,9 +636,9 @@ public class IndexUpdate implements Editor, PathSource {
NodeBuilder builder, IndexUpdateCallback updateCallback,
NodeTraversalCallback traversalCallback,
CommitInfo commitInfo, CorruptIndexHandler corruptIndexHandler) {
- this.provider = checkNotNull(provider);
+ this.provider = requireNonNull(provider);
this.async = async;
- this.root = checkNotNull(root);
+ this.root = requireNonNull(root);
this.commitInfo = commitInfo;
this.corruptIndexHandler = corruptIndexHandler;
this.indexDisabler = new IndexDisabler(builder);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
index a68905f45c..8666afd4d4 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
@@ -43,7 +43,7 @@ import org.apache.jackrabbit.oak.stats.MeterStats;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class TrackingCorruptIndexHandler implements CorruptIndexHandler {
@@ -112,7 +112,7 @@ public class TrackingCorruptIndexHandler implements CorruptIndexHandler {
@Override
public boolean skippingCorruptIndex(String async, String indexPath, Calendar corruptSince) {
CorruptIndexInfo info = getOrCreateInfo(async, indexPath);
- if (info.skippedIndexing(checkNotNull(corruptSince))) {
+ if (info.skippedIndexing(requireNonNull(corruptSince))) {
log.warn("Ignoring index [{}] which has been marked as corrupt [{}]. This index " +
"MUST be reindexed to work properly", indexPath,
info.getStats());
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
index b166e14834..fb1eb93d2c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.PrefetchNodeStore;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* This utility class provides factory methods to create commonly used types of
@@ -104,7 +104,7 @@ public class Cursors {
* @return cursor over the ancestors of <code>c</code> at <code>level</code>.
*/
public static Cursor newAncestorCursor(Cursor c, int level, QueryLimits settings) {
- checkNotNull(c);
+ requireNonNull(c);
checkArgument(level >= 1);
return new AncestorCursor(c, level, settings);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
index 27a29defc2..bd3a2ce812 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
@@ -34,7 +34,7 @@ import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
@Component(
configurationPolicy = ConfigurationPolicy.REQUIRE,
@@ -63,7 +63,7 @@ public class DataStoreTextProviderService {
@Activate
private void activate(BundleContext context, Configuration config) throws IOException {
String dirPath = config.dir();
- checkNotNull(dirPath, "Directory path not configured via 'dir'");
+ requireNonNull(dirPath, "Directory path not configured via 'dir'");
File dir = new File(dirPath);
checkArgument(dir.exists(), "Directory %s does not exist", dir.getAbsolutePath());
textWriter = new DataStoreTextWriter(dir, true);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
index ea30279bdf..7a8bd0564a 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
@@ -43,7 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
/**
@@ -124,8 +124,8 @@ public class DataStoreTextWriter implements TextWriter, Closeable, PreExtractedT
@Override
public void write(@NotNull String blobId,@NotNull String text) throws IOException {
checkIfReadOnlyModeEnabled();
- checkNotNull(blobId, "BlobId cannot be null");
- checkNotNull(text, "Text passed for [%s] was null", blobId);
+ requireNonNull(blobId, "BlobId cannot be null");
+ requireNonNull(text, String.format("Text passed for [%s] was null", blobId));
File textFile = getFile(stripLength(blobId));
ensureParentExists(textFile);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java
index a2392b8de3..b41e544968 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/fulltext/ExtractedText.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.fulltext;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -73,7 +73,7 @@ public class ExtractedText {
private void checkState() {
if (extractionResult == ExtractionResult.SUCCESS){
- checkNotNull(extractedText, "extractedText must not be null for SUCCESS");
+ requireNonNull(extractedText, "extractedText must not be null for SUCCESS");
}
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AbortingIndexerLock.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AbortingIndexerLock.java
index c0193e70d6..4a10ff15e8 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AbortingIndexerLock.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AbortingIndexerLock.java
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.stats.Clock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Lock implementation for single node setup like for SegmentNodeStore
@@ -71,9 +71,9 @@ public class AbortingIndexerLock implements AsyncIndexerLock<SimpleToken> {
private IndexStatsMBean getIndexStatsMBean(String asyncIndexerLane) {
AsyncIndexInfo info = infoService.getInfo(asyncIndexerLane);
- checkNotNull(info, "No AsyncIndexInfo found for lane [%s]", asyncIndexerLane);
+ requireNonNull(info, String.format("No AsyncIndexInfo found for lane [%s]", asyncIndexerLane));
IndexStatsMBean mbean = info.getStatsMBean();
- return checkNotNull(mbean, "No IndexStatsMBean associated with [%s]", asyncIndexerLane);
+ return requireNonNull(mbean, String.format("No IndexStatsMBean associated with [%s]", asyncIndexerLane));
}
private void retry(IndexStatsMBean mbean, int timeoutSeconds, int intervalBetweenTriesMsec) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
index 6a1a1f92e7..77ba9d9895 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
@@ -56,7 +56,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_COUNT;
import static org.apache.jackrabbit.oak.plugins.index.importer.IndexDefinitionUpdater.INDEX_DEFINITIONS_JSON;
import static org.apache.jackrabbit.oak.plugins.index.importer.NodeStoreUtils.mergeWithConcurrentCheck;
@@ -113,8 +113,8 @@ public class IndexImporter {
indexerInfo = IndexerInfo.fromDirectory(indexDir);
this.indexerLock = indexerLock;
indexes = indexerInfo.getIndexes();
- indexedState = checkNotNull(nodeStore.retrieve(indexerInfo.checkpoint), "Cannot retrieve " +
- "checkpointed state [%s]", indexerInfo.checkpoint);
+ indexedState = requireNonNull(nodeStore.retrieve(indexerInfo.checkpoint), String.format("Cannot retrieve " +
+ "checkpointed state [%s]", indexerInfo.checkpoint));
this.indexDefinitionUpdater = new IndexDefinitionUpdater(new File(indexDir, INDEX_DEFINITIONS_JSON));
this.asyncLaneToIndexMapping = mapIndexesToLanes(indexes);
this.indexPathsToUpdate = new HashSet<>();
@@ -264,12 +264,12 @@ public class IndexImporter {
boolean success = false;
try {
String checkpoint = getAsync().getString(laneName);
- checkNotNull(checkpoint, "No current checkpoint found for lane [%s]", laneName);
+ requireNonNull(checkpoint, String.format("No current checkpoint found for lane [%s]", laneName));
//TODO Support case where checkpoint got lost or complete reindexing is done
NodeState after = nodeStore.retrieve(checkpoint);
- checkNotNull(after, "No state found for checkpoint [%s] for lane [%s]", checkpoint, laneName);
+ requireNonNull(after, String.format("No state found for checkpoint [%s] for lane [%s]", checkpoint, laneName));
LOG.info("Proceeding to update imported indexes {} to checkpoint [{}] for lane [{}]",
indexInfos, checkpoint, laneName);
@@ -374,7 +374,7 @@ public class IndexImporter {
private IndexImporterProvider getImporter(String type) {
IndexImporterProvider provider = importers.get(type);
- return checkNotNull(provider, "No IndexImporterProvider found for type [%s]", type);
+ return requireNonNull(provider, String.format("No IndexImporterProvider found for type [%s]", type));
}
private ListMultimap<String, IndexInfo> mapIndexesToLanes(Map<String, File> indexes) {
@@ -390,7 +390,7 @@ public class IndexImporter {
boolean newIndex = !NodeStateUtils.getNode(rootState, indexPath).exists();
String type = indexState.getString(IndexConstants.TYPE_PROPERTY_NAME);
- checkNotNull(type, "No 'type' property found for index at path [%s]", indexPath);
+ requireNonNull(type, String.format("No 'type' property found for index at path [%s]", indexPath));
String asyncName = getAsyncLaneName(indexPath, indexState);
if (asyncName == null) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
index be0a7a0297..c4ffad2460 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Represents the index data created by oak-run tooling on the file system.
@@ -66,7 +66,7 @@ public class IndexerInfo {
public IndexerInfo(File rootDir, String checkpoint) {
this.rootDir = rootDir;
- this.checkpoint = checkNotNull(checkpoint);
+ this.checkpoint = requireNonNull(checkpoint);
}
public void save() throws IOException {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/NodeStoreUtils.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/NodeStoreUtils.java
index 9f334cb8b9..536d46edbf 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/NodeStoreUtils.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/NodeStoreUtils.java
@@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.spi.commit.SimpleCommitContext;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.singletonList;
final class NodeStoreUtils {
@@ -66,7 +66,7 @@ final class NodeStoreUtils {
}
static NodeBuilder childBuilder(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/PropUtils.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/PropUtils.java
index 8a64729c49..7cbba44534 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/PropUtils.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/PropUtils.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
final class PropUtils {
@@ -42,7 +42,7 @@ final class PropUtils {
}
static String getProp(Properties p, String key) {
- return checkNotNull(p.getProperty(key), "No property named [%s] found", key);
+ return requireNonNull(p.getProperty(key), String.format("No property named [%s] found", key));
}
static void writeTo(Properties p, File file, String comment) throws IOException {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
index 0128c2c374..a9b1b76ae2 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
@@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexInfoService;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
@Component(
service = InventoryPrinter.class,
@@ -64,8 +64,8 @@ public class IndexPrinter implements InventoryPrinter {
}
public IndexPrinter(IndexInfoService indexInfoService, AsyncIndexInfoService asyncIndexInfoService) {
- this.indexInfoService = checkNotNull(indexInfoService);
- this.asyncIndexInfoService = checkNotNull(asyncIndexInfoService);
+ this.indexInfoService = requireNonNull(indexInfoService);
+ this.asyncIndexInfoService = requireNonNull(asyncIndexInfoService);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java
index bf9a1ff5c8..7c7d8671e2 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/jmx/PropertyIndexAsyncReindex.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.index.property.jmx;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.System.nanoTime;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.formatTime;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.done;
@@ -53,8 +53,8 @@ public class PropertyIndexAsyncReindex implements
*/
public PropertyIndexAsyncReindex(@NotNull AsyncIndexUpdate async,
@NotNull Executor executor) {
- this.async = checkNotNull(async);
- this.executor = checkNotNull(executor);
+ this.async = requireNonNull(async);
+ this.executor = requireNonNull(executor);
}
@NotNull
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/upgrade/IndexDisabler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/upgrade/IndexDisabler.java
index 1006975661..8e997e4f40 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/upgrade/IndexDisabler.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/upgrade/IndexDisabler.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyList;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DISABLE_INDEXES_ON_NEXT_CYCLE;
@@ -152,7 +152,7 @@ public class IndexDisabler {
}
private static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.getChildNode(name);
}
return nb;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java
index 754c65962b..37813211e8 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/NodeStateCopier.java
@@ -40,7 +40,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.copyOf;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static java.util.Collections.emptySet;
@@ -141,7 +141,7 @@ public class NodeStateCopier {
*/
public static boolean copyNodeStore(@NotNull final NodeStore source, @NotNull final NodeStore target)
throws CommitFailedException {
- return builder().copy(checkNotNull(source), checkNotNull(target));
+ return builder().copy(requireNonNull(source), requireNonNull(target));
}
/**
@@ -402,7 +402,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder include(@NotNull Set<String> paths) {
- if (!checkNotNull(paths).isEmpty()) {
+ if (!requireNonNull(paths).isEmpty()) {
this.includePaths = copyOf(paths);
}
return this;
@@ -417,7 +417,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder include(@NotNull String... paths) {
- return include(copyOf(checkNotNull(paths)));
+ return include(copyOf(requireNonNull(paths)));
}
/**
@@ -442,7 +442,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder exclude(@NotNull Set<String> paths) {
- if (!checkNotNull(paths).isEmpty()) {
+ if (!requireNonNull(paths).isEmpty()) {
this.excludePaths = copyOf(paths);
}
return this;
@@ -457,7 +457,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder exclude(@NotNull String... paths) {
- return exclude(copyOf(checkNotNull(paths)));
+ return exclude(copyOf(requireNonNull(paths)));
}
/**
@@ -469,7 +469,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder supportFragment(@NotNull Set<String> paths) {
- if (!checkNotNull(paths).isEmpty()) {
+ if (!requireNonNull(paths).isEmpty()) {
this.fragmentPaths = copyOf(paths);
}
return this;
@@ -484,7 +484,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder supportFragment(@NotNull String... paths) {
- return supportFragment(copyOf(checkNotNull(paths)));
+ return supportFragment(copyOf(requireNonNull(paths)));
}
/**
@@ -496,7 +496,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder excludeFragments(@NotNull Set<String> fragments) {
- if (!checkNotNull(fragments).isEmpty()) {
+ if (!requireNonNull(fragments).isEmpty()) {
this.excludeFragments = copyOf(fragments);
}
return this;
@@ -511,7 +511,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder excludeFragments(@NotNull String... fragments) {
- return exclude(copyOf(checkNotNull(fragments)));
+ return exclude(copyOf(requireNonNull(fragments)));
}
/**
@@ -523,7 +523,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder merge(@NotNull Set<String> paths) {
- if (!checkNotNull(paths).isEmpty()) {
+ if (!requireNonNull(paths).isEmpty()) {
this.mergePaths = copyOf(paths);
}
return this;
@@ -538,7 +538,7 @@ public class NodeStateCopier {
*/
@NotNull
public Builder merge(@NotNull String... paths) {
- return merge(copyOf(checkNotNull(paths)));
+ return merge(copyOf(requireNonNull(paths)));
}
@NotNull
@@ -574,7 +574,7 @@ public class NodeStateCopier {
public boolean copy(@NotNull final NodeState sourceRoot, @NotNull final NodeBuilder targetRoot) {
final NodeStateCopier copier = new NodeStateCopier(includePaths, excludePaths, fragmentPaths,
excludeFragments, mergePaths, referenceableFrozenNodes, preserveOnTarget, newNodesConsumer);
- return copier.copyNodeState(checkNotNull(sourceRoot), checkNotNull(targetRoot));
+ return copier.copyNodeState(requireNonNull(sourceRoot), requireNonNull(targetRoot));
}
/**
@@ -593,8 +593,8 @@ public class NodeStateCopier {
*/
public boolean copy(@NotNull final NodeStore source, @NotNull final NodeStore target)
throws CommitFailedException {
- final NodeBuilder targetRoot = checkNotNull(target).getRoot().builder();
- if (copy(checkNotNull(source).getRoot(), targetRoot)) {
+ final NodeBuilder targetRoot = requireNonNull(target).getRoot().builder();
+ if (copy(requireNonNull(source).getRoot(), targetRoot)) {
target.merge(targetRoot, EmptyHook.INSTANCE, CommitInfo.EMPTY);
return true;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java
index d68a7a20b7..045bf556fc 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractTypeDefinition.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
@@ -38,8 +38,8 @@ abstract class AbstractTypeDefinition {
protected final NamePathMapper mapper;
protected AbstractTypeDefinition(Tree definition, NamePathMapper mapper) {
- this.definition = checkNotNull(definition);
- this.mapper = checkNotNull(mapper);
+ this.definition = requireNonNull(definition);
+ this.mapper = requireNonNull(mapper);
}
/**
@@ -49,7 +49,7 @@ abstract class AbstractTypeDefinition {
* @return property value, or {@code false} if the property does not exist
*/
protected boolean getBoolean(@NotNull String name) {
- PropertyState property = definition.getProperty(checkNotNull(name));
+ PropertyState property = definition.getProperty(requireNonNull(name));
return property != null && property.getValue(Type.BOOLEAN);
}
@@ -97,7 +97,7 @@ abstract class AbstractTypeDefinition {
}
private String getValue(String oakName, Type<String> type) {
- PropertyState property = definition.getProperty(checkNotNull(oakName));
+ PropertyState property = definition.getProperty(requireNonNull(oakName));
if (property != null) {
return property.getValue(type);
} else {
@@ -108,7 +108,7 @@ abstract class AbstractTypeDefinition {
private String[] getValues(String oakName, Type<String> type) {
String[] values = null;
- PropertyState property = definition.getProperty(checkNotNull(oakName));
+ PropertyState property = definition.getProperty(requireNonNull(oakName));
if (property != null) {
int n = property.count();
if (n > 0) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
index 61dbab78e3..c0b1ada781 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static javax.jcr.PropertyType.UNDEFINED;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
@@ -68,8 +68,8 @@ class EffectiveNodeTypeImpl implements EffectiveNodeType {
this.ntMgr = ntMgr;
this.valueFactory = new PartialValueFactory(ntMgr.getNamePathMapper());
- addNodeType(checkNotNull(primary));
- for (NodeTypeImpl mixin : checkNotNull(mixins)) {
+ addNodeType(requireNonNull(primary));
+ for (NodeTypeImpl mixin : requireNonNull(mixins)) {
addNodeType(mixin);
}
if (!nodeTypes.containsKey(NT_BASE)) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
index 79d75b3bc6..14f4d501d2 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
@@ -55,7 +55,7 @@ class EffectiveType {
private final List<NodeState> types;
EffectiveType(@NotNull List<NodeState> types) {
- this.types = checkNotNull(types);
+ this.types = requireNonNull(types);
}
/**
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java
index 05112b3332..1478905acf 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.Objects;
@@ -49,7 +49,7 @@ class ItemDefinitionImpl extends AbstractTypeDefinition
protected ItemDefinitionImpl(
Tree definition, NodeType type, NamePathMapper mapper) {
super(definition, mapper);
- this.type = checkNotNull(type);
+ this.type = requireNonNull(type);
}
//-----------------------------------------------------< ItemDefinition >---
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
index 7a38c1e87d..37d8ee545b 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -379,8 +379,8 @@ public abstract class ReadOnlyNodeTypeManager implements NodeTypeManager, Effect
@Override
public NodeDefinition getDefinition(@NotNull Tree parent, @NotNull String nodeName)
throws RepositoryException {
- checkNotNull(parent);
- checkNotNull(nodeName);
+ requireNonNull(parent);
+ requireNonNull(nodeName);
EffectiveNodeType effective = getEffectiveNodeType(parent);
return effective.getNodeDefinition(nodeName, null);
}
@@ -389,8 +389,8 @@ public abstract class ReadOnlyNodeTypeManager implements NodeTypeManager, Effect
@Override
public NodeDefinition getDefinition(@NotNull Tree parent, @NotNull Tree targetNode)
throws RepositoryException {
- checkNotNull(parent);
- checkNotNull(targetNode);
+ requireNonNull(parent);
+ requireNonNull(targetNode);
String name = dropIndexFromName(targetNode.getName());
EffectiveNodeType eff = getEffectiveNodeType(parent);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
index c5b942bb13..45d84cd461 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.in;
import static org.apache.jackrabbit.guava.common.collect.Iterables.any;
import static org.apache.jackrabbit.JcrConstants.JCR_ISMIXIN;
@@ -171,7 +171,7 @@ public class TypeEditor extends DefaultEditor {
String primary, Iterable<String> mixins, NodeBuilder builder)
throws CommitFailedException {
this.valueFactory = new PartialValueFactory(NamePathMapper.DEFAULT);
- this.callback = checkNotNull(callback);
+ this.callback = requireNonNull(callback);
this.typesToCheck = typesToCheck;
this.checkThisNode =
typesToCheck == null
@@ -179,9 +179,9 @@ public class TypeEditor extends DefaultEditor {
|| any(mixins, in(typesToCheck));
this.parent = null;
this.nodeName = null;
- this.types = checkNotNull(types);
+ this.types = requireNonNull(types);
this.effective = createEffectiveType(null, null, primary, mixins);
- this.builder = checkNotNull(builder);
+ this.builder = requireNonNull(builder);
this.validate = false;
}
@@ -197,11 +197,11 @@ public class TypeEditor extends DefaultEditor {
typesToCheck == null
|| typesToCheck.contains(primary)
|| any(mixins, in(typesToCheck));
- this.parent = checkNotNull(parent);
- this.nodeName = checkNotNull(name);
+ this.parent = requireNonNull(parent);
+ this.nodeName = requireNonNull(name);
this.types = parent.types;
this.effective = createEffectiveType(parent.effective, name, primary, mixins);
- this.builder = checkNotNull(builder);
+ this.builder = requireNonNull(builder);
this.validate = validate;
}
@@ -216,7 +216,7 @@ public class TypeEditor extends DefaultEditor {
this.parent = null;
this.nodeName = null;
this.types = EMPTY_NODE;
- this.effective = checkNotNull(effective);
+ this.effective = requireNonNull(effective);
this.builder = EMPTY_NODE.builder();
this.validate = false;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
index 5007f850a2..7c76b141a4 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.in;
import static org.apache.jackrabbit.guava.common.collect.Iterables.any;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
@@ -53,7 +53,7 @@ public class TypePredicate implements Predicate<NodeState> {
@NotNull
public static TypePredicate isOrderable(@NotNull NodeState root) {
Set<String> orderable = newHashSet();
- NodeState types = checkNotNull(root)
+ NodeState types = requireNonNull(root)
.getChildNode(JCR_SYSTEM)
.getChildNode(JCR_NODE_TYPES);
for (ChildNodeEntry entry : types.getChildNodeEntries()) {
@@ -146,10 +146,10 @@ public class TypePredicate implements Predicate<NodeState> {
private void init() {
if (!initialized) {
// lazy initialization of the sets of matching type names
- NodeState types = checkNotNull(root)
+ NodeState types = requireNonNull(root)
.getChildNode(JCR_SYSTEM)
.getChildNode(JCR_NODE_TYPES);
- for (String name : checkNotNull(names)) {
+ for (String name : requireNonNull(names)) {
addNodeType(types, name);
}
initialized = true;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
index 31dbb938c7..1fe786e1df 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype.write;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTVALUES;
import static org.apache.jackrabbit.JcrConstants.JCR_MULTIPLE;
import static org.apache.jackrabbit.JcrConstants.JCR_REQUIREDTYPE;
@@ -174,7 +174,7 @@ class PropertyDefinitionTemplateImpl extends ItemDefinitionTemplate
@Override
public void setAvailableQueryOperators(String[] operators) {
- checkNotNull(operators);
+ requireNonNull(operators);
this.queryOperators = new String[operators.length];
System.arraycopy(operators, 0, this.queryOperators, 0, operators.length);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java
index 6f6fb2d291..ef153628a6 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringDispatcher.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
@@ -39,7 +39,7 @@ public class FilteringDispatcher implements Observer {
private NodeState before;
public FilteringDispatcher(FilteringAwareObserver observer) {
- this.observer = checkNotNull(observer);
+ this.observer = requireNonNull(observer);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java
index cf5dcf4edd..47d2c819c5 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilteringObserver.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.observation;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.Closeable;
import java.util.concurrent.Executor;
@@ -70,7 +70,7 @@ public class FilteringObserver implements Observer, Closeable {
*/
public FilteringObserver(@NotNull Executor executor, int queueLength, @NotNull Filter filter,
@NotNull FilteringAwareObserver observer) {
- this(new BackgroundObserver(new FilteringDispatcher(checkNotNull(observer)), checkNotNull(executor),
+ this(new BackgroundObserver(new FilteringDispatcher(requireNonNull(observer)), requireNonNull(executor),
queueLength), filter);
}
@@ -81,7 +81,7 @@ public class FilteringObserver implements Observer, Closeable {
*/
public FilteringObserver(@NotNull BackgroundObserver backgroundObserver, @NotNull Filter filter) {
this.backgroundObserver = backgroundObserver;
- this.filter = checkNotNull(filter);
+ this.filter = requireNonNull(filter);
}
public BackgroundObserver getBackgroundObserver() {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
index 538d125999..a27fee2a12 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ACFilter.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
@@ -50,11 +50,11 @@ public final class ACFilter implements EventFilter {
@NotNull String name,
@NotNull PermissionProvider permissionProvider,
@NotNull ACFilter parentFilter) {
- this.before = checkNotNull(before);
- this.after = checkNotNull(after);
- this.name = checkNotNull(name);
- this.permissionProvider = checkNotNull(permissionProvider);
- this.parentFilter = checkNotNull(parentFilter);
+ this.before = requireNonNull(before);
+ this.after = requireNonNull(after);
+ this.name = requireNonNull(name);
+ this.permissionProvider = requireNonNull(permissionProvider);
+ this.parentFilter = requireNonNull(parentFilter);
}
/**
@@ -68,10 +68,10 @@ public final class ACFilter implements EventFilter {
public ACFilter(@NotNull NodeState before,
@NotNull NodeState after,
@NotNull PermissionProvider permissionProvider) {
- this.before = checkNotNull(before);
- this.after = checkNotNull(after);
+ this.before = requireNonNull(before);
+ this.after = requireNonNull(after);
this.name = null;
- this.permissionProvider = checkNotNull(permissionProvider);
+ this.permissionProvider = requireNonNull(permissionProvider);
this.parentFilter = null;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
index 8a08efc72e..d9efdaa968 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static javax.jcr.observation.Event.NODE_ADDED;
@@ -105,7 +105,7 @@ public final class FilterBuilder {
return this;
}
}
- subTrees.add(checkNotNull(absPath));
+ subTrees.add(requireNonNull(absPath));
return this;
}
@@ -180,7 +180,7 @@ public final class FilterBuilder {
*/
@NotNull
public FilterBuilder condition(@NotNull Condition condition) {
- this.condition = checkNotNull(condition);
+ this.condition = requireNonNull(condition);
return this;
}
@@ -214,7 +214,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition accessControl(@NotNull PermissionProviderFactory permissionProviderFactory) {
- return new ACCondition(checkNotNull(permissionProviderFactory));
+ return new ACCondition(requireNonNull(permissionProviderFactory));
}
/**
@@ -225,7 +225,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition path(@NotNull String pathPattern) {
- return new PathCondition(checkNotNull(pathPattern));
+ return new PathCondition(requireNonNull(pathPattern));
}
/**
@@ -259,7 +259,7 @@ public final class FilterBuilder {
} else if (ntNames.length == 0) {
return excludeAll();
} else {
- return new NodeTypeCondition(checkNotNull(selector), ntNames);
+ return new NodeTypeCondition(requireNonNull(selector), ntNames);
}
}
@@ -277,7 +277,7 @@ public final class FilterBuilder {
} else if (uuids.length == 0) {
return excludeAll();
} else {
- return new UniversalCondition(checkNotNull(selector), new UuidPredicate(uuids));
+ return new UniversalCondition(requireNonNull(selector), new UuidPredicate(uuids));
}
}
@@ -293,8 +293,8 @@ public final class FilterBuilder {
@NotNull Predicate<PropertyState> predicate) {
return new UniversalCondition(
- checkNotNull(selector),
- new PropertyPredicate(checkNotNull(name), checkNotNull(predicate)));
+ requireNonNull(selector),
+ new PropertyPredicate(requireNonNull(name), requireNonNull(predicate)));
}
/**
@@ -305,7 +305,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition universal(@NotNull Selector selector, @NotNull Predicate<NodeState> predicate) {
- return new UniversalCondition(checkNotNull(selector), checkNotNull(predicate));
+ return new UniversalCondition(requireNonNull(selector), requireNonNull(predicate));
}
/**
@@ -341,7 +341,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition any(@NotNull Condition... conditions) {
- return new AnyCondition(newArrayList(checkNotNull(conditions)));
+ return new AnyCondition(newArrayList(requireNonNull(conditions)));
}
/**
@@ -351,7 +351,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition all(@NotNull Condition... conditions) {
- return new AllCondition(newArrayList(checkNotNull(conditions)));
+ return new AllCondition(newArrayList(requireNonNull(conditions)));
}
/**
@@ -361,7 +361,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition all(@NotNull List<Condition> conditions) {
- return new AllCondition(checkNotNull(conditions));
+ return new AllCondition(requireNonNull(conditions));
}
/**
@@ -371,7 +371,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition not(@NotNull Condition condition) {
- return new NotCondition(checkNotNull(condition));
+ return new NotCondition(requireNonNull(condition));
}
/**
@@ -381,7 +381,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition any(@NotNull Iterable<Condition> conditions) {
- return new AnyCondition(checkNotNull(conditions));
+ return new AnyCondition(requireNonNull(conditions));
}
/**
@@ -391,7 +391,7 @@ public final class FilterBuilder {
*/
@NotNull
public Condition all(@NotNull Iterable<Condition> conditions) {
- return new AllCondition(checkNotNull(conditions));
+ return new AllCondition(requireNonNull(conditions));
}
/**
@@ -416,7 +416,7 @@ public final class FilterBuilder {
@Override
public boolean includeCommit(@NotNull String sessionId, @Nullable CommitInfo info) {
- return (includeSessionLocal || !isLocal(checkNotNull(sessionId), info))
+ return (includeSessionLocal || !isLocal(requireNonNull(sessionId), info))
&& (includeClusterExternal || !isExternal(info))
&& (includeClusterLocal || isExternal(info));
}
@@ -424,7 +424,7 @@ public final class FilterBuilder {
@NotNull
@Override
public EventFilter getFilter(@NotNull NodeState before, @NotNull NodeState after) {
- return condition.createFilter(checkNotNull(before), checkNotNull(after));
+ return condition.createFilter(requireNonNull(before), requireNonNull(after));
}
@NotNull
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
index 6548171f6e..3e1e40ff81 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.observation.filter.ConstantFilter.EXCLUDE_ALL;
import static org.apache.jackrabbit.oak.plugins.observation.filter.ConstantFilter.INCLUDE_ALL;
@@ -100,7 +100,7 @@ public final class Filters {
*/
@NotNull
public static EventFilter any(@NotNull final EventFilter... filters) {
- return any(Lists.newArrayList(checkNotNull(filters)));
+ return any(Lists.newArrayList(requireNonNull(filters)));
}
/**
@@ -111,7 +111,7 @@ public final class Filters {
*/
@NotNull
public static EventFilter all(@NotNull final EventFilter... filters) {
- return all(Lists.newArrayList(checkNotNull(filters)));
+ return all(Lists.newArrayList(requireNonNull(filters)));
}
/**
@@ -138,7 +138,7 @@ public final class Filters {
*/
@NotNull
public static EventFilter any(@NotNull final List<EventFilter> filters) {
- if (checkNotNull(filters).isEmpty()) {
+ if (requireNonNull(filters).isEmpty()) {
return EXCLUDE_ALL;
} else if (filters.size() == 1) {
return filters.get(0);
@@ -237,7 +237,7 @@ public final class Filters {
*/
@NotNull
public static EventFilter all(@NotNull final List<EventFilter> filters) {
- if (checkNotNull(filters).isEmpty()) {
+ if (requireNonNull(filters).isEmpty()) {
return INCLUDE_ALL;
} else if (filters.size() == 1) {
return filters.get(0);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
index 10b17deeb6..e257f8e9eb 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import java.util.ArrayList;
@@ -77,15 +77,15 @@ public class GlobbingPathFilter implements EventFilter {
// OAK-5589 : for internal constructor case don't copy the pattern, refer to the same one
// this will work fine given the public constructors make a copy and internally we're
// never fiddling with the pattern list
- this.pattern = checkNotNull(pattern);
- this.patternMap = checkNotNull(patternMap);
+ this.pattern = requireNonNull(pattern);
+ this.patternMap = requireNonNull(patternMap);
}
public GlobbingPathFilter(@NotNull String pattern, Map<String, Pattern> patternMap) {
// OAK-5589 : use the fastest way to create a List based on an unknown deep pattern
this.pattern = new ArrayList<String>(10);
- Iterators.addAll(this.pattern, elements(checkNotNull(pattern)).iterator());
- this.patternMap = checkNotNull(patternMap);
+ Iterators.addAll(this.pattern, elements(requireNonNull(pattern)).iterator());
+ this.patternMap = requireNonNull(patternMap);
}
/** for testing only - use variant which passes the patternMap for productive code **/
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
index f4e18f81f1..3842701bc0 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.function.Predicate;
@@ -42,8 +42,8 @@ public class PropertyPredicate implements Predicate<NodeState> {
*/
public PropertyPredicate(
@NotNull String name, @NotNull Predicate<PropertyState> propertyPredicate) {
- this.name = checkNotNull(name);
- this.propertyPredicate = checkNotNull(propertyPredicate);
+ this.name = requireNonNull(name);
+ this.propertyPredicate = requireNonNull(propertyPredicate);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
index 3b3780e372..65104f6ff2 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/RelativePathSelector.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -44,8 +44,8 @@ public class RelativePathSelector implements Selector {
* @param selector selector to base {@code path} upon
*/
public RelativePathSelector(@NotNull String path, @NotNull Selector selector) {
- this.path = elements(checkNotNull(path));
- this.selector = checkNotNull(selector);
+ this.path = elements(requireNonNull(path));
+ this.selector = requireNonNull(selector);
}
@NotNull
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
index d267e5c76b..dc25c1e9ef 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UniversalFilter.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import java.util.function.Predicate;
@@ -53,10 +53,10 @@ public class UniversalFilter implements EventFilter {
public UniversalFilter(
@NotNull NodeState before, @NotNull NodeState after,
@NotNull Selector selector, @NotNull Predicate<NodeState> predicate) {
- this.beforeState = checkNotNull(before);
- this.afterState = checkNotNull(after);
- this.predicate = checkNotNull(predicate);
- this.selector = checkNotNull(selector);
+ this.beforeState = requireNonNull(before);
+ this.afterState = requireNonNull(after);
+ this.predicate = requireNonNull(predicate);
+ this.selector = requireNonNull(selector);
}
/**
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
index 9c829e89d0..dbe0627641 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.observation.filter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import java.util.function.Predicate;
@@ -42,7 +42,7 @@ public class UuidPredicate implements Predicate<NodeState> {
* @param uuids uuids
*/
public UuidPredicate(@NotNull String[] uuids) {
- this.uuids = checkNotNull(uuids);
+ this.uuids = requireNonNull(uuids);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
index 8842a0bcba..0b204c59ca 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.plugins.tree.impl;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER;
@@ -170,25 +170,25 @@ public abstract class AbstractMutableTree extends AbstractTree {
@Override
public void setProperty(@NotNull PropertyState property) {
- checkArgument(!isHidden(checkNotNull(property).getName()));
+ checkArgument(!isHidden(requireNonNull(property).getName()));
getNodeBuilder().setProperty(property);
}
@Override
public <T> void setProperty(@NotNull String name, @NotNull T value) throws IllegalArgumentException {
- checkArgument(!isHidden(checkNotNull(name)));
- getNodeBuilder().setProperty(name, checkNotNull(value));
+ checkArgument(!isHidden(requireNonNull(name)));
+ getNodeBuilder().setProperty(name, requireNonNull(value));
}
@Override
public <T> void setProperty(@NotNull String name, @NotNull T value, @NotNull Type<T> type)
throws IllegalArgumentException {
- checkArgument(!isHidden(checkNotNull(name)));
- getNodeBuilder().setProperty(name, checkNotNull(value), checkNotNull(type));
+ checkArgument(!isHidden(requireNonNull(name)));
+ getNodeBuilder().setProperty(name, requireNonNull(value), requireNonNull(type));
}
@Override
public void removeProperty(@NotNull String name) {
- getNodeBuilder().removeProperty(checkNotNull(name));
+ getNodeBuilder().removeProperty(requireNonNull(name));
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java
index 64c1a7c025..6aac24a398 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/HiddenTree.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.Collections;
@@ -120,7 +120,7 @@ class HiddenTree implements Tree {
@NotNull
@Override
public Tree getChild(@NotNull String name) {
- return new HiddenTree(this, checkNotNull(name));
+ return new HiddenTree(this, requireNonNull(name));
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java
index bf4be41068..4928fbe816 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/NodeBuilderTree.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.jetbrains.annotations.NotNull;
@@ -76,7 +76,7 @@ public final class NodeBuilderTree extends AbstractMutableTree {
@Override
@NotNull
protected NodeBuilderTree createChild(@NotNull String name) throws IllegalArgumentException {
- return new NodeBuilderTree(this, nodeBuilder.getChildNode(checkNotNull(name)), name);
+ return new NodeBuilderTree(this, nodeBuilder.getChildNode(requireNonNull(name)), name);
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/OrphanedVersionCleaner.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/OrphanedVersionCleaner.java
index 040cf6679a..3bada59028 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/OrphanedVersionCleaner.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/OrphanedVersionCleaner.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONSTORAGE;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
index 6b45537d44..4352ff935c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* {@code ReadOnlyVersionManager} provides implementations for read-only
@@ -306,7 +306,7 @@ public abstract class ReadOnlyVersionManager {
protected Tree checkVersionable(@NotNull Tree tree)
throws UnsupportedRepositoryOperationException,
RepositoryException {
- if (!isVersionable(checkNotNull(tree))) {
+ if (!isVersionable(requireNonNull(tree))) {
throw new UnsupportedRepositoryOperationException("Node at " +
tree.getPath() + " is not versionable");
}
@@ -322,7 +322,7 @@ public abstract class ReadOnlyVersionManager {
*/
protected boolean isVersionable(@NotNull Tree tree) {
return getNodeTypeManager().isNodeType(
- checkNotNull(tree), VersionConstants.MIX_VERSIONABLE);
+ requireNonNull(tree), VersionConstants.MIX_VERSIONABLE);
}
/**
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
index 124d10c714..4e6eedfb6c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
@@ -53,7 +53,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_CREATED;
@@ -89,8 +89,8 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
public ReadWriteVersionManager(NodeBuilder versionStorageNode,
NodeBuilder workspaceRoot) {
- this.versionStorageNode = checkNotNull(versionStorageNode);
- this.workspaceRoot = checkNotNull(workspaceRoot);
+ this.versionStorageNode = requireNonNull(versionStorageNode);
+ this.workspaceRoot = requireNonNull(workspaceRoot);
this.isVersion = new TypePredicate(workspaceRoot.getNodeState(), NT_VERSION);
}
@@ -128,7 +128,7 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
*/
@NotNull
public NodeBuilder getOrCreateVersionHistory(@NotNull NodeBuilder versionable, @NotNull Map<String, Object> infoMap) {
- checkNotNull(versionable);
+ requireNonNull(versionable);
String vUUID = uuidFromNode(versionable);
String relPath = getVersionHistoryPath(vUUID);
NodeBuilder node = versionStorageNode;
@@ -345,8 +345,8 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
public void removeVersionLabel(@NotNull String historyRelPath,
@NotNull String label)
throws CommitFailedException {
- NodeBuilder labels = getVersionLabelsFor(checkNotNull(historyRelPath));
- if (!labels.hasProperty(checkNotNull(label))) {
+ NodeBuilder labels = getVersionLabelsFor(requireNonNull(historyRelPath));
+ if (!labels.hasProperty(requireNonNull(label))) {
throw new CommitFailedException(CommitFailedException.VERSION,
VersionExceptionCode.NO_SUCH_VERSION_LABEL.ordinal(),
"Version label " + label + " does not exist on this version history");
@@ -644,7 +644,7 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
*/
@NotNull
private NodeBuilder getVersionHistory(@NotNull NodeState versionable) {
- checkNotNull(versionable);
+ requireNonNull(versionable);
String vUUID = uuidFromNode(versionable);
String relPath = getVersionHistoryPath(vUUID);
NodeBuilder node = versionStorageNode;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java
index 4c8c62e3a5..86038178fc 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java
@@ -22,7 +22,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import javax.jcr.nodetype.NodeType;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.JcrConstants.MIX_REFERENCEABLE;
@@ -66,7 +66,7 @@ public final class Utils {
@NotNull
static String uuidFromNode(@NotNull NodeState node) {
- PropertyState p = checkNotNull(node).getProperty(JCR_UUID);
+ PropertyState p = requireNonNull(node).getProperty(JCR_UUID);
if (p == null) {
throw new IllegalArgumentException("Not referenceable");
}
@@ -85,7 +85,7 @@ public final class Utils {
@NotNull
static String primaryTypeOf(@NotNull NodeBuilder node)
throws IllegalStateException {
- String primaryType = checkNotNull(node).getName(JCR_PRIMARYTYPE);
+ String primaryType = requireNonNull(node).getName(JCR_PRIMARYTYPE);
if (primaryType == null) {
throw new IllegalStateException("Node does not have a jcr:primaryType");
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java
index e9752fea04..c9a5ca40d5 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.JcrConstants.MIX_VERSIONABLE;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
@@ -64,8 +64,8 @@ class VersionEditor implements Editor {
public VersionEditor(@NotNull NodeBuilder versionStore,
@NotNull NodeBuilder workspaceRoot,
@NotNull CommitInfo commitInfo) {
- this(null, new ReadWriteVersionManager(checkNotNull(versionStore),
- checkNotNull(workspaceRoot)), workspaceRoot, "", commitInfo);
+ this(null, new ReadWriteVersionManager(requireNonNull(versionStore),
+ requireNonNull(workspaceRoot)), workspaceRoot, "", commitInfo);
}
VersionEditor(@Nullable VersionEditor parent,
@@ -74,9 +74,9 @@ class VersionEditor implements Editor {
@NotNull String name,
@NotNull CommitInfo commitInfo) {
this.parent = parent;
- this.vMgr = checkNotNull(vMgr);
- this.node = checkNotNull(node);
- this.name = checkNotNull(name);
+ this.vMgr = requireNonNull(vMgr);
+ this.node = requireNonNull(node);
+ this.name = requireNonNull(name);
this.commitInfo = commitInfo;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
index 5d6cd7a1a6..db5a02890d 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONLABELS;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
@@ -62,10 +62,10 @@ class VersionStorageEditor extends DefaultEditor {
@NotNull NodeBuilder builder,
@NotNull String path,
boolean initPhase) {
- this.versionStorageNode = checkNotNull(versionStorageNode);
- this.workspaceRoot = checkNotNull(workspaceRoot);
- this.builder = checkNotNull(builder);
- this.path = checkNotNull(path);
+ this.versionStorageNode = requireNonNull(versionStorageNode);
+ this.workspaceRoot = requireNonNull(workspaceRoot);
+ this.builder = requireNonNull(builder);
+ this.path = requireNonNull(path);
this.initPhase = initPhase;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
index b2f786f63b..54f0f6dea2 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionableState.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static javax.jcr.version.OnParentVersionAction.ABORT;
import static javax.jcr.version.OnParentVersionAction.COMPUTE;
import static javax.jcr.version.OnParentVersionAction.COPY;
@@ -118,12 +118,12 @@ class VersionableState {
@NotNull NodeBuilder versionable,
@NotNull ReadWriteVersionManager vMgr,
@NotNull ReadOnlyNodeTypeManager ntMgr) {
- this.version = checkNotNull(version);
- this.history = checkNotNull(history);
+ this.version = requireNonNull(version);
+ this.history = requireNonNull(history);
this.frozenNode = version.child(JCR_FROZENNODE);
- this.versionable = checkNotNull(versionable);
- this.vMgr = checkNotNull(vMgr);
- this.ntMgr = checkNotNull(ntMgr);
+ this.versionable = requireNonNull(versionable);
+ this.vMgr = requireNonNull(vMgr);
+ this.ntMgr = requireNonNull(ntMgr);
this.isFrozenNodeReferenceable = Utils.isFrozenNodeReferenceable(ntMgr);
}
@@ -260,8 +260,8 @@ class VersionableState {
@NotNull String name,
@NotNull VersionSelector selector)
throws RepositoryException, CommitFailedException {
- checkNotNull(name);
- checkNotNull(destParent);
+ requireNonNull(name);
+ requireNonNull(destParent);
String primaryType = primaryTypeOf(src);
if (primaryType.equals(NT_FROZENNODE)) {
// replace with frozen state
@@ -457,7 +457,7 @@ class VersionableState {
*/
private void restoreVersionable(@NotNull NodeBuilder versionable,
@NotNull NodeBuilder version) {
- checkNotNull(versionable).setProperty(JCR_ISCHECKEDOUT,
+ requireNonNull(versionable).setProperty(JCR_ISCHECKEDOUT,
false, Type.BOOLEAN);
versionable.setProperty(JCR_VERSIONHISTORY,
uuidFromNode(history), Type.REFERENCE);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
index 37a122e17a..a4867e694a 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import java.text.ParseException;
@@ -327,7 +327,7 @@ public abstract class QueryEngineImpl implements QueryEngine {
private Query prepareAndSelect(@NotNull List<Query> queries) {
Query result = null;
- if (checkNotNull(queries).size() == 1) {
+ if (requireNonNull(queries).size() == 1) {
// we only have the original query so we prepare and return it.
result = queries.iterator().next();
result.prepare();
@@ -341,7 +341,7 @@ public abstract class QueryEngineImpl implements QueryEngine {
// can more easily analyze problems. The querySelectionMode flag can
// be used to override the cheapest.
boolean isPotentiallySlow = true;
- for (Query q : checkNotNull(queries)) {
+ for (Query q : requireNonNull(queries)) {
q.prepare();
if (!q.isPotentiallySlow()) {
isPotentiallySlow = false;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
index b314eb1a33..278d7b9669 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
@@ -13,7 +13,7 @@
*/
package org.apache.jackrabbit.oak.query;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.oak.query.ast.AstElementFactory.copyElementAndCheckReference;
@@ -1495,7 +1495,7 @@ public class QueryImpl implements Query {
}
private static String recomposeStatement(@NotNull QueryImpl query) {
- checkNotNull(query);
+ requireNonNull(query);
String original = query.getStatement();
String origUpper = original.toUpperCase(Locale.ENGLISH);
StringBuilder recomputed = new StringBuilder();
@@ -1525,8 +1525,8 @@ public class QueryImpl implements Query {
private UnionQueryImpl newAlternativeUnionQuery(@NotNull Query left, @NotNull Query right) {
UnionQueryImpl u = new UnionQueryImpl(
false,
- checkNotNull(left, "`left` cannot be null"),
- checkNotNull(right, "`right` cannot be null"),
+ requireNonNull(left, "`left` cannot be null"),
+ requireNonNull(right, "`right` cannot be null"),
this.settings);
u.setExplain(explain);
u.setMeasure(measure);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
index e32c8c47b3..2478368169 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import java.math.BigDecimal;
@@ -127,9 +127,9 @@ public class SQL2Parser {
public SQL2Parser(NamePathMapper namePathMapper, NodeTypeInfoProvider nodeTypes, QueryEngineSettings settings,
QueryExecutionStats stats) {
this.namePathMapper = namePathMapper;
- this.nodeTypes = checkNotNull(nodeTypes);
- this.settings = checkNotNull(settings);
- this.stats = checkNotNull(stats);
+ this.nodeTypes = requireNonNull(nodeTypes);
+ this.settings = requireNonNull(settings);
+ this.stats = requireNonNull(stats);
}
/**
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
index bfa36eba51..d99888762b 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
@@ -13,7 +13,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.ArrayList;
@@ -199,7 +199,7 @@ public class AstElementFactory {
*/
@NotNull
public static AstElement copyElementAndCheckReference(@NotNull final AstElement e) {
- AstElement clone = checkNotNull(e).copyOf();
+ AstElement clone = requireNonNull(e).copyOf();
if (clone == e && LOG.isDebugEnabled()) {
LOG.debug(
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ColumnImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ColumnImpl.java
index 24d9659c41..d0b0fde968 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ColumnImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ColumnImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -31,9 +31,9 @@ public class ColumnImpl extends AstElement {
private SelectorImpl selector;
public ColumnImpl(String selectorName, String propertyName, String columnName) {
- this.selectorName = checkNotNull(selectorName);
- this.propertyName = checkNotNull(propertyName);
- this.columnName = checkNotNull(columnName);
+ this.selectorName = requireNonNull(selectorName);
+ this.propertyName = requireNonNull(propertyName);
+ this.columnName = requireNonNull(columnName);
}
public String getColumnName() {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
index fe9a50dafc..3f7cc64e9d 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NotFullTextSearchImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.Set;
@@ -61,7 +61,7 @@ public class NotFullTextSearchImpl extends FullTextSearchImpl {
}
private static boolean isKeyword(@NotNull String term) {
- return KEYWORDS.contains(checkNotNull(term).toLowerCase());
+ return KEYWORDS.contains(requireNonNull(term).toLowerCase());
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
index e097611bd9..0a33736546 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
@@ -187,8 +187,8 @@ public class SelectorImpl extends SourceImpl {
private boolean updateTotalQueryHistogram = true;
public SelectorImpl(NodeTypeInfo nodeTypeInfo, String selectorName) {
- this.nodeTypeInfo = checkNotNull(nodeTypeInfo);
- this.selectorName = checkNotNull(selectorName);
+ this.nodeTypeInfo = requireNonNull(nodeTypeInfo);
+ this.selectorName = requireNonNull(selectorName);
this.nodeTypeName = nodeTypeInfo.getNodeTypeName();
this.matchesAllTypes = NT_BASE.equals(nodeTypeName);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
index 4a87680a37..901b129593 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
@@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.framework.BundleContext;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* @deprecated Replaced by {@code org.apache.jackrabbit.oak.security.internal.SecurityProviderBuilder}
@@ -103,7 +103,7 @@ public class SecurityProviderImpl implements SecurityProvider, WhiteboardAware {
* @param configuration security configuration
*/
public SecurityProviderImpl(@NotNull ConfigurationParameters configuration) {
- checkNotNull(configuration);
+ requireNonNull(configuration);
this.configuration = configuration;
authenticationConfiguration = initDefaultConfiguration(new AuthenticationConfigurationImpl(this));
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
index a3721c6aaf..026fa5eb68 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
abstract class ACL extends AbstractAccessControlList {
@@ -165,7 +165,7 @@ abstract class ACL extends AbstractAccessControlList {
final String principalName = entry.getPrincipal().getName();
final Set<Restriction> restrictions = entry.getRestrictions();
List<ACE> subList = Lists.newArrayList(Iterables.filter(entries, ace ->
- principalName.equals(checkNotNull(ace).getPrincipal().getName()) && restrictions.equals(ace.getRestrictions())));
+ principalName.equals(requireNonNull(ace).getPrincipal().getName()) && restrictions.equals(ace.getRestrictions())));
boolean addEntry = true;
for (ACE existing : subList) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
index 97e92d73c5..f6c8e42c24 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
@@ -55,7 +55,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* {@link ProtectedNodeImporter} implementation that handles access control lists,
@@ -298,7 +298,7 @@ public class AccessControlImporter implements ProtectedNodeImporter, AccessContr
}
private void applyTo(JackrabbitAccessControlList acl) throws RepositoryException {
- checkNotNull(acl);
+ requireNonNull(acl);
if (!ignore) {
acl.addEntry(principal, privileges.toArray(new Privilege[0]), isAllow, restrictions, mvRestrictions);
} else {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
index 4352d1a75a..efd6ad55d5 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
@@ -92,7 +92,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Default implementation of the {@code JackrabbitAccessControlManager} interface.
@@ -535,7 +535,7 @@ public class AccessControlManagerImpl extends AbstractAccessControlManager imple
@NotNull Map<String, Principal> principalMap) throws RepositoryException {
boolean isAllow = NT_REP_GRANT_ACE.equals(TreeUtil.getPrimaryTypeName(aceTree));
Set<Restriction> restrictions = restrictionProvider.readRestrictions(oakPath, aceTree);
- Iterable<String> privNames = checkNotNull(TreeUtil.getStrings(aceTree, REP_PRIVILEGES));
+ Iterable<String> privNames = requireNonNull(TreeUtil.getStrings(aceTree, REP_PRIVILEGES));
return new Entry(getPrincipal(aceTree, principalMap), getPrivilegeBitsProvider().getBits(privNames), isAllow, restrictions, getNamePathMapper());
}
@@ -574,7 +574,7 @@ public class AccessControlManagerImpl extends AbstractAccessControlManager imple
@NotNull
private Principal getPrincipal(@NotNull Tree aceTree, @NotNull Map<String, Principal> principalMap) {
- String principalName = checkNotNull(TreeUtil.getString(aceTree, REP_PRINCIPAL_NAME));
+ String principalName = requireNonNull(TreeUtil.getString(aceTree, REP_PRINCIPAL_NAME));
return principalMap.computeIfAbsent(principalName, pn -> {
Principal principal = principalManager.getPrincipal(pn);
if (principal == null) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
index e0ec6f8d27..e1104099f6 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
@@ -52,7 +52,7 @@ import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.CommitFailedException.ACCESS_CONTROL;
import static org.apache.jackrabbit.oak.api.CommitFailedException.OAK;
@@ -128,7 +128,7 @@ class AccessControlValidator extends DefaultValidator implements AccessControlCo
@Override
public Validator childNodeAdded(String name, NodeState after) throws CommitFailedException {
- Tree treeAfter = checkNotNull(parentAfter.getChild(name));
+ Tree treeAfter = requireNonNull(parentAfter.getChild(name));
checkValidTree(parentAfter, treeAfter, after);
return newValidator(this, treeAfter);
@@ -136,7 +136,7 @@ class AccessControlValidator extends DefaultValidator implements AccessControlCo
@Override
public Validator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException {
- Tree treeAfter = checkNotNull(parentAfter.getChild(name));
+ Tree treeAfter = requireNonNull(parentAfter.getChild(name));
checkValidTree(parentAfter, treeAfter, after);
return newValidator(this, treeAfter);
@@ -278,7 +278,7 @@ class AccessControlValidator extends DefaultValidator implements AccessControlCo
private void checkValidRestrictions(@NotNull Tree aceTree) throws CommitFailedException {
String path;
- Tree aclTree = checkNotNull(aceTree.getParent());
+ Tree aclTree = requireNonNull(aceTree.getParent());
String aclPath = aclTree.getPath();
if (REP_REPO_POLICY.equals(Text.getName(aclPath))) {
path = null;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
index 4ec960d078..817e00d844 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_CREATED;
import static org.apache.jackrabbit.JcrConstants.MIX_REFERENCEABLE;
import static org.apache.jackrabbit.oak.api.CommitFailedException.ACCESS;
@@ -134,7 +134,7 @@ class PermissionValidator extends DefaultValidator {
@Override
public Validator childNodeAdded(String name, NodeState after) throws CommitFailedException {
- Tree child = checkNotNull(parentAfter.getChild(name));
+ Tree child = requireNonNull(parentAfter.getChild(name));
if (isVersionstorageTree(child)) {
child = getVersionHistoryTree(child);
if (child == null) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
index 79808889ea..88ae6e719f 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* {@code GlobPattern} defines a simplistic pattern matching. It consists
@@ -90,7 +90,7 @@ final class GlobPattern implements RestrictionPattern {
private final Pattern pattern;
private GlobPattern(@NotNull String path, @NotNull String restriction) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
this.restriction = restriction;
if (!restriction.isEmpty()) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
index ea5a0fbd85..2c4a1e7f2c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.getIdentifier;
/**
@@ -42,8 +42,8 @@ abstract class AuthorizableBaseProvider implements UserConstants {
private final boolean usercaseMappedProfile;
AuthorizableBaseProvider(@NotNull Root root, @NotNull ConfigurationParameters config) {
- this.root = checkNotNull(root);
- this.config = checkNotNull(config);
+ this.root = requireNonNull(root);
+ this.config = requireNonNull(config);
identifierManager = new IdentifierManager(root);
usercaseMappedProfile = config.getConfigValue(PARAM_ENABLE_RFC7613_USERCASE_MAPPED_PROFILE, DEFAULT_ENABLE_RFC7613_USERCASE_MAPPED_PROFILE);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java
index 20c161c5c3..400cd050e8 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CacheValidatorProvider.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Validator provider to ensure that the principal-cache stored with a given
@@ -117,7 +117,7 @@ class CacheValidatorProvider extends ValidatorProvider implements CacheConstants
@Override
public Validator childNodeChanged(String name, NodeState before, NodeState after) throws CommitFailedException {
- Tree beforeTree = checkNotNull(parentBefore).getChild(name);
+ Tree beforeTree = requireNonNull(parentBefore).getChild(name);
Tree afterTree = parentAfter.getChild(name);
if (isCache || isCache(beforeTree) || isCache(afterTree)) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
index c610439225..da61471ecc 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
@@ -77,7 +77,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -721,7 +721,7 @@ class UserImporter implements ProtectedPropertyImporter, ProtectedNodeImporter,
throw new RepositoryException(userPath + " does not represent a valid user.");
}
- Impersonation imp = checkNotNull(((User) a).getImpersonation());
+ Impersonation imp = requireNonNull(((User) a).getImpersonation());
// 1. collect principals to add and to remove.
Map<String, Principal> toRemove = new HashMap<>();
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
index b6c017743f..2f67940d03 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH;
@@ -358,7 +358,7 @@ class UserProvider extends AuthorizableBaseProvider {
}
private String getNodeName(@NotNull String authorizableId) {
- AuthorizableNodeName generator = checkNotNull(config.getConfigValue(PARAM_AUTHORIZABLE_NODE_NAME, AuthorizableNodeName.DEFAULT, AuthorizableNodeName.class));
+ AuthorizableNodeName generator = requireNonNull(config.getConfigValue(PARAM_AUTHORIZABLE_NODE_NAME, AuthorizableNodeName.DEFAULT, AuthorizableNodeName.class));
return generator.generateNodeName(authorizableId);
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
index 0b53734931..7b34de597c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Validator that enforces user management specific constraints. Please note that
@@ -89,7 +89,7 @@ class UserValidator extends DefaultValidator implements UserConstants {
String msg = "Authorizable property " + name + " may not be altered after user/group creation.";
throw constraintViolation(22, msg);
} else if (JcrConstants.JCR_UUID.equals(name)) {
- checkNotNull(parentAfter);
+ requireNonNull(parentAfter);
if (!isValidUUID(parentAfter, after.getValue(Type.STRING))) {
String msg = "Invalid jcr:uuid for authorizable " + parentAfter.getName();
throw constraintViolation(23, msg);
@@ -123,7 +123,7 @@ class UserValidator extends DefaultValidator implements UserConstants {
@Override
public Validator childNodeAdded(String name, NodeState after) throws CommitFailedException {
- Tree tree = checkNotNull(parentAfter.getChild(name));
+ Tree tree = requireNonNull(parentAfter.getChild(name));
validateAuthorizable(tree, UserUtil.getType(tree));
return newValidator(null, tree, provider);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
index 43a71c15fa..7e3b2f8cae 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.atomic;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.oak.api.Type.LONG;
@@ -188,7 +188,7 @@ public class AtomicCounterEditorTest {
* @param properties
*/
private static void assertNoCounters(@NotNull final Iterable<? extends PropertyState> properties) {
- checkNotNull(properties);
+ requireNonNull(properties);
for (PropertyState p : properties) {
assertFalse("there should be no counter property",
@@ -204,7 +204,7 @@ public class AtomicCounterEditorTest {
private static void assertTotalCountersValue(@NotNull final Iterable<? extends PropertyState> properties,
int expected) {
int total = 0;
- for (PropertyState p : checkNotNull(properties)) {
+ for (PropertyState p : requireNonNull(properties)) {
if (p.getName().startsWith(PREFIX_PROP_COUNTER)) {
total += p.getValue(LONG);
}
@@ -214,15 +214,15 @@ public class AtomicCounterEditorTest {
}
private static NodeBuilder setMixin(@NotNull final NodeBuilder builder) {
- return checkNotNull(builder).setProperty(JCR_MIXINTYPES, of(MIX_ATOMIC_COUNTER), NAMES);
+ return requireNonNull(builder).setProperty(JCR_MIXINTYPES, of(MIX_ATOMIC_COUNTER), NAMES);
}
private static void assertCounterNodeState(@NotNull NodeBuilder builder,
@NotNull Set<String> hiddenProps,
long expectedCounter) {
- checkNotNull(builder);
- checkNotNull(hiddenProps);
+ requireNonNull(builder);
+ requireNonNull(hiddenProps);
long totalHiddenValue = 0;
PropertyState counter = builder.getProperty(PROP_COUNTER);
Set<String> hp = Sets.newHashSet(hiddenProps);
@@ -246,7 +246,7 @@ public class AtomicCounterEditorTest {
}
private static NodeBuilder incrementBy(@NotNull NodeBuilder builder, @NotNull PropertyState increment) {
- return checkNotNull(builder).setProperty(checkNotNull(increment));
+ return requireNonNull(builder).setProperty(requireNonNull(increment));
}
@Test
@@ -495,8 +495,8 @@ public class AtomicCounterEditorTest {
public <V> ScheduledFuture<V> schedule(final Callable<V> callable, long delay, TimeUnit unit) {
LOG.debug("Scheduling with delay: {} and unit: {} the process {}", delay, unit, callable);
- checkNotNull(callable);
- checkNotNull(unit);
+ requireNonNull(callable);
+ requireNonNull(unit);
if (delay < 0) {
delay = 0;
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
index 9b8bc170ca..b7088b8412 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_PROPERTY_NAME;
@@ -1084,7 +1084,7 @@ public class IndexUpdateTest {
}
private static NodeBuilder child(NodeBuilder nb, String path){
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
index 3928e347e0..6f65a1583b 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.nodetype.write;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
@@ -93,7 +93,7 @@ public class NodeTypeRegistryTest {
static void registerNodeType(@NotNull Root root, @NotNull String resourceName) throws IOException {
checkArgument(!Strings.isNullOrEmpty(resourceName));
- checkNotNull(root);
+ requireNonNull(root);
InputStream stream = null;
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerNtTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerNtTest.java
index e45a3ade7c..b9be0f3a2c 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerNtTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerNtTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.version;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
@@ -52,7 +52,7 @@ public class ReadOnlyVersionManagerNtTest extends ReadOnlyVersionManagerTest {
@Test
public void testNtFrozenNodeUuid() throws Exception {
- Tree baseVersion = checkNotNull(versionManager.getBaseVersion(versionable));
+ Tree baseVersion = requireNonNull(versionManager.getBaseVersion(versionable));
Tree frozen = baseVersion.getChild(VersionConstants.JCR_FROZENNODE);
PropertyState uuid = frozen.getProperty("jcr:uuid");
if (oakReferenceableFrozenNode == null ||
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java
index 685eb93d45..63b2f7ec00 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManagerTest.java
@@ -33,7 +33,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.junit.Assert.assertEquals;
@@ -106,13 +106,13 @@ public class ReadOnlyVersionManagerTest extends AbstractSecurityTest {
@Test
public void testGetVersionable() throws Exception {
- Tree versionHistory = checkNotNull(versionManager.getVersionHistory(root.getTree("/a")));
+ Tree versionHistory = requireNonNull(versionManager.getVersionHistory(root.getTree("/a")));
assertVersionable("/a", versionHistory);
Tree rootVersion = versionHistory.getChild(JcrConstants.JCR_ROOTVERSION);
assertVersionable("/a", rootVersion);
- Tree baseVersion = checkNotNull(versionManager.getBaseVersion(versionable));
+ Tree baseVersion = requireNonNull(versionManager.getBaseVersion(versionable));
assertVersionable("/a", baseVersion);
Tree frozen = baseVersion.getChild(VersionConstants.JCR_FROZENNODE);
@@ -144,7 +144,7 @@ public class ReadOnlyVersionManagerTest extends AbstractSecurityTest {
@Test
public void testGetVersionableMissingPathProperty() throws Exception {
- Tree versionHistory = checkNotNull(versionManager.getVersionHistory(root.getTree("/a")));
+ Tree versionHistory = requireNonNull(versionManager.getVersionHistory(root.getTree("/a")));
versionHistory.removeProperty(workspaceName);
assertNull(versionManager.getVersionable(versionHistory, workspaceName));
@@ -153,7 +153,7 @@ public class ReadOnlyVersionManagerTest extends AbstractSecurityTest {
@Test
public void testGetVersionableNonExistingWorkspace() throws Exception {
- Tree versionHistory = checkNotNull(versionManager.getVersionHistory(root.getTree("/a")));
+ Tree versionHistory = requireNonNull(versionManager.getVersionHistory(root.getTree("/a")));
assertNull(versionManager.getVersionable(versionHistory, "nonExistingWorkspaceName"));
assertNull(versionManager.getVersionable(versionHistory.getChild(JcrConstants.JCR_ROOTVERSION), "nonExistingWorkspaceName"));
@@ -161,7 +161,7 @@ public class ReadOnlyVersionManagerTest extends AbstractSecurityTest {
@Test
public void testGetVersionableTargetRemoved() throws Exception {
- Tree baseVersion = checkNotNull(versionManager.getBaseVersion(versionable));
+ Tree baseVersion = requireNonNull(versionManager.getBaseVersion(versionable));
versionable.remove();
root.commit();
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
index 40d299ab20..cb09b688d3 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
@@ -63,7 +63,7 @@ import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.jetbrains.annotations.NotNull;
import org.junit.Before;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS;
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
@@ -345,8 +345,8 @@ public abstract class AbstractQueryTest {
}
protected static void assertResult(@NotNull List<String> expected, @NotNull List<String> actual) {
- for (String p : checkNotNull(expected)) {
- assertTrue("Expected path " + p + " not found, got " + actual, checkNotNull(actual)
+ for (String p : requireNonNull(expected)) {
+ assertTrue("Expected path " + p + " not found, got " + actual, requireNonNull(actual)
.contains(p));
}
assertEquals("Result set size is different: " + actual, expected.size(),
@@ -358,7 +358,7 @@ public abstract class AbstractQueryTest {
}
protected void setQuerySelectionMode(@NotNull QuerySelectionMode querySelectionMode) {
- ((QueryEngineImpl) qe).setQuerySelectionMode(checkNotNull(querySelectionMode));
+ ((QueryEngineImpl) qe).setQuerySelectionMode(requireNonNull(querySelectionMode));
}
protected static String readRow(ResultRow row, boolean pathOnly) {
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java
index f8686ad3ea..c571cf01a4 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/SQL2OptimiseQueryTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static javax.jcr.query.Query.JCR_SQL2;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -162,9 +162,9 @@ public class SQL2OptimiseQueryTest extends AbstractQueryTest {
@NotNull List<String> optimised,
@NotNull List<String> cheapest) {
// checks that all the three list are the expected content
- assertThat(checkNotNull(original), is(checkNotNull(expected)));
- assertThat(checkNotNull(optimised), is(expected));
- assertThat(checkNotNull(cheapest), is(expected));
+ assertThat(requireNonNull(original), is(requireNonNull(expected)));
+ assertThat(requireNonNull(optimised), is(expected));
+ assertThat(requireNonNull(cheapest), is(expected));
// check that all the three lists contains the same. Paranoid but still a fast check
assertThat(original, is(optimised));
@@ -174,9 +174,9 @@ public class SQL2OptimiseQueryTest extends AbstractQueryTest {
private static Tree addChildWithProperty(@NotNull Tree father, @NotNull String name,
@NotNull String propName, @NotNull String propValue) {
- Tree t = checkNotNull(father).addChild(checkNotNull(name));
+ Tree t = requireNonNull(father).addChild(requireNonNull(name));
t.setProperty(JCR_PRIMARYTYPE, NT_OAK_UNSTRUCTURED, NAME);
- t.setProperty(checkNotNull(propName), checkNotNull(propValue));
+ t.setProperty(requireNonNull(propName), requireNonNull(propValue));
return t;
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
index b0f9622a0a..47aea55d7c 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/AndImplTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static java.util.Collections.emptySet;
import static org.hamcrest.CoreMatchers.is;
@@ -73,8 +73,8 @@ public class AndImplTest {
*/
private static ConstraintImpl mockConstraint(@NotNull String toString,
@NotNull Class<? extends ConstraintImpl> clazz) {
- ConstraintImpl c = mock(checkNotNull(clazz));
- when(c.toString()).thenReturn(checkNotNull(toString));
+ ConstraintImpl c = mock(requireNonNull(clazz));
+ when(c.toString()).thenReturn(requireNonNull(toString));
return c;
}
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
index 1bc97b8aae..69f5973a6d 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
@@ -13,7 +13,7 @@
*/
package org.apache.jackrabbit.oak.query.index;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
@@ -442,8 +442,8 @@ public class TraversingIndexQueryTest extends AbstractQueryTest {
@NotNull final String name,
@Nullable final String propertyName,
@Nullable final Long value) {
- checkNotNull(parent);
- checkNotNull(name);
+ requireNonNull(parent);
+ requireNonNull(name);
Tree ret = parent.addChild(name);
ret.setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java
index 51256bf754..f5a9593288 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/AbstractTokenTest.java
@@ -37,7 +37,7 @@ import org.junit.Before;
import java.util.Collections;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertNotNull;
/**
@@ -103,7 +103,7 @@ public abstract class AbstractTokenTest extends AbstractSecurityTest implements
@NotNull
Tree getUserTree(@NotNull String uid) throws RepositoryException {
- return root.getTree(checkNotNull(getUserManager(root).getAuthorizable(uid)).getPath());
+ return root.getTree(requireNonNull(getUserManager(root).getAuthorizable(uid)).getPath());
}
@NotNull
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
index 03ac15bb11..873f88b1c5 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
@@ -87,7 +87,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.singletonMap;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NT_OAK_UNSTRUCTURED;
@@ -1174,12 +1174,12 @@ public class AccessControlManagerImplTest extends AbstractAccessControlTest impl
Tree ace2 = children.next();
assertEquals(NT_REP_DENY_ACE, TreeUtil.getPrimaryTypeName(ace2));
- assertEquals(EveryonePrincipal.NAME, checkNotNull(ace2.getProperty(REP_PRINCIPAL_NAME)).getValue(Type.STRING));
+ assertEquals(EveryonePrincipal.NAME, requireNonNull(ace2.getProperty(REP_PRINCIPAL_NAME)).getValue(Type.STRING));
Privilege[] privs = privilegesFromNames(TreeUtil.getNames(ace2, REP_PRIVILEGES));
assertEquals(newHashSet(testPrivileges), newHashSet(privs));
assertTrue(ace2.hasChild(REP_RESTRICTIONS));
Tree restr = ace2.getChild(REP_RESTRICTIONS);
- assertEquals("*/something", checkNotNull(restr.getProperty(REP_GLOB)).getValue(Type.STRING));
+ assertEquals("*/something", requireNonNull(restr.getProperty(REP_GLOB)).getValue(Type.STRING));
}
@Test
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/AbstractOakCoreTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/AbstractOakCoreTest.java
index 2e2934bb9e..5754bd8450 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/AbstractOakCoreTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/AbstractOakCoreTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
/**
@@ -139,7 +139,7 @@ public abstract class AbstractOakCoreTest extends AbstractSecurityTest {
boolean isAllow,
@NotNull String... privilegeNames) throws Exception {
AccessControlManager acMgr = getAccessControlManager(root);
- JackrabbitAccessControlList acl = checkNotNull(AccessControlUtils.getAccessControlList(acMgr, path));
+ JackrabbitAccessControlList acl = requireNonNull(AccessControlUtils.getAccessControlList(acMgr, path));
acl.addEntry(principal, AccessControlUtils.privilegesFromNames(acMgr, privilegeNames), isAllow);
acMgr.setPolicy(path, acl);
root.commit();
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImplTest.java
index 3a0f49c2a8..0069063812 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImplTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImplTest.java
@@ -57,7 +57,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENNODE;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -195,7 +195,7 @@ public class CompiledPermissionImplTest extends AbstractSecurityTest {
}
ReadOnlyVersionManager vm = ReadOnlyVersionManager.getInstance(root, getNamePathMapper());
- return checkNotNull(vm.getVersionHistory(tree));
+ return requireNonNull(vm.getVersionHistory(tree));
}
@Test
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java
index 2edbf60522..c1a5557abc 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermissionTest.java
@@ -43,7 +43,7 @@ import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -137,7 +137,7 @@ public class VersionTreePermissionTest extends AbstractSecurityTest implements N
@Test
public void testGetTreePermission() throws Exception {
- Tree versionHistory = checkNotNull(vMgr.getVersionHistory(testTree));
+ Tree versionHistory = requireNonNull(vMgr.getVersionHistory(testTree));
String expectedPath = "/test";
@@ -165,7 +165,7 @@ public class VersionTreePermissionTest extends AbstractSecurityTest implements N
@Test
public void testGetChild() throws Exception {
- Tree versionHistory = checkNotNull(vMgr.getVersionHistory(testTree));
+ Tree versionHistory = requireNonNull(vMgr.getVersionHistory(testTree));
Tree t = getRootProvider().createReadOnlyRoot(root).getTree("/");
TreePermission tp = pp.getTreePermission(t, TreePermission.EMPTY);
@@ -196,7 +196,7 @@ public class VersionTreePermissionTest extends AbstractSecurityTest implements N
@Test
public void testVersionableRemoved() throws Exception {
- Tree versionHistory = checkNotNull(vMgr.getVersionHistory(testTree));
+ Tree versionHistory = requireNonNull(vMgr.getVersionHistory(testTree));
testTree.remove();
root.commit();
@@ -230,7 +230,7 @@ public class VersionTreePermissionTest extends AbstractSecurityTest implements N
root.commit();
pp.refresh();
- Tree versionHistory = checkNotNull(vMgr.getVersionHistory(testTree));
+ Tree versionHistory = requireNonNull(vMgr.getVersionHistory(testTree));
String frozenCPath = PathUtils.concat(versionHistory.getPath(), "1.0", JCR_FROZENNODE, "a/b/c");
TreePermission tp = getVersionPermission(root, pp, frozenCPath);
@@ -250,7 +250,7 @@ public class VersionTreePermissionTest extends AbstractSecurityTest implements N
root.commit();
pp.refresh();
- Tree versionHistory = checkNotNull(vMgr.getVersionHistory(testTree));
+ Tree versionHistory = requireNonNull(vMgr.getVersionHistory(testTree));
String frozenAPath = PathUtils.concat(versionHistory.getPath(), "1.0", JCR_FROZENNODE, "a");
TreePermission tp = getVersionPermission(root, pp, frozenAPath);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java
index f053db0eea..6154b21c5f 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/JcrAllTest.java
@@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -74,7 +74,7 @@ public class JcrAllTest extends AbstractSecurityTest implements PrivilegeConstan
new Function<Privilege, String>() {
@Override
public String apply(@Nullable Privilege privilege) {
- return checkNotNull(privilege).getName();
+ return requireNonNull(privilege).getName();
}
}), String.class);
PrivilegeBits all2 = bitsProvider.getBits(allAggregates);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java
index 32727fc071..d3b4a62172 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidatorTest.java
@@ -41,7 +41,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NT_OAK_UNSTRUCTURED;
import static org.junit.Assert.assertEquals;
@@ -62,7 +62,7 @@ public class PrivilegeValidatorTest extends AbstractSecurityTest implements Priv
public void before() throws Exception {
super.before();
bitsProvider = new PrivilegeBitsProvider(root);
- privilegesTree = checkNotNull(bitsProvider.getPrivilegesTree());
+ privilegesTree = requireNonNull(bitsProvider.getPrivilegesTree());
}
@After
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterMembershipIgnoreTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterMembershipIgnoreTest.java
index 80e92c4689..70a86d8087 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterMembershipIgnoreTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterMembershipIgnoreTest.java
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -218,7 +218,7 @@ public class UserImporterMembershipIgnoreTest extends UserImporterBaseTest {
// member to be imported has already been added before
Group gr = (Group) ((UserManagerImpl) getUserManager(root)).getAuthorizable(groupTree);
- checkNotNull(gr).addMembers(TEST_USER_ID);
+ requireNonNull(gr).addMembers(TEST_USER_ID);
assertTrue(importer.handlePropInfo(userTree, createPropInfo(REP_AUTHORIZABLE_ID, TEST_USER_ID), mockPropertyDefinition(NT_REP_AUTHORIZABLE, false)));
assertTrue(importer.handlePropInfo(groupTree, createPropInfo(REP_MEMBERS, contentId), mockPropertyDefinition(NT_REP_MEMBER_REFERENCES, true)));
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
index fbf5575ca9..c663c8cacb 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserValidatorTest.java
@@ -45,7 +45,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
@@ -329,7 +329,7 @@ public class UserValidatorTest extends AbstractSecurityTest implements UserConst
String adminId = getConfig().getConfigValue(PARAM_ADMIN_ID, DEFAULT_ADMIN_ID);
Authorizable admin = getUserManager(root).getAuthorizable(adminId);
- Tree userTree = root.getTree(checkNotNull(admin).getPath());
+ Tree userTree = root.getTree(requireNonNull(admin).getPath());
UserValidator validator = createUserValidator(userTree, userTree);
userTree.remove();
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
index 9bca53afcf..4af97d3088 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
@@ -54,7 +54,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_READ;
import static org.apache.jackrabbit.oak.spi.security.user.UserConstants.DEFAULT_ADMIN_ID;
import static org.apache.jackrabbit.oak.spi.security.user.UserConstants.PARAM_GROUP_PATH;
@@ -126,7 +126,7 @@ public class UserQueryManagerTest extends AbstractUserTest {
g = getUserManager(root).createGroup(id);
}
} else {
- checkNotNull(principal);
+ requireNonNull(principal);
g = getUserManager(root).createGroup(principal);
}
groups.add(g);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java
index 809043ccbb..71b4250d82 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtil.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.Type.DATE;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -61,8 +61,8 @@ public class NodeUtil {
private final Tree tree;
public NodeUtil(Tree tree, NameMapper mapper) {
- this.mapper = checkNotNull(mapper);
- this.tree = checkNotNull(tree);
+ this.mapper = requireNonNull(mapper);
+ this.tree = requireNonNull(tree);
}
public NodeUtil(Tree tree) {
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
index a5bd374bd9..fa8a0c91ff 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/permission/L1_IntroductionTest.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* <pre>
@@ -186,7 +186,7 @@ public class L1_IntroductionTest extends AbstractSecurityTest {
boolean isAllow,
@NotNull String... privilegeNames) throws Exception {
AccessControlManager acMgr = getAccessControlManager(root);
- JackrabbitAccessControlList acl = checkNotNull(AccessControlUtils.getAccessControlList(acMgr, path));
+ JackrabbitAccessControlList acl = requireNonNull(AccessControlUtils.getAccessControlList(acMgr, path));
acl.addEntry(principal, AccessControlUtils.privilegesFromNames(acMgr, privilegeNames), isAllow);
acMgr.setPolicy(path, acl);
root.commit();
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L2_AccessControlManagementTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L2_AccessControlManagementTest.java
index 25e2f024f4..f1d1055d0c 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L2_AccessControlManagementTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L2_AccessControlManagementTest.java
@@ -41,7 +41,7 @@ import javax.jcr.security.AccessControlPolicy;
import java.security.Principal;
import java.util.Iterator;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -211,12 +211,12 @@ public class L2_AccessControlManagementTest extends AbstractPrincipalBasedTest {
@Test
public void testEffectivePolicies() throws Exception {
- JackrabbitAccessControlList acl = checkNotNull(AccessControlUtils.getAccessControlList(compositeAcMgr, testPath));
+ JackrabbitAccessControlList acl = requireNonNull(AccessControlUtils.getAccessControlList(compositeAcMgr, testPath));
acl.addAccessControlEntry(supportedPrincipal, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES));
acl.addAccessControlEntry(unsupportedPrincipal, privilegesFromNames(PrivilegeConstants.JCR_MODIFY_PROPERTIES));
compositeAcMgr.setPolicy(acl.getPath(), acl);
- PrincipalAccessControlList pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal));
+ PrincipalAccessControlList pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal));
pacl.addEntry(testPath, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
root.commit();
@@ -250,11 +250,11 @@ public class L2_AccessControlManagementTest extends AbstractPrincipalBasedTest {
@Test
public void testEffectivePoliciesByPath() throws Exception {
- JackrabbitAccessControlList acl = checkNotNull(AccessControlUtils.getAccessControlList(compositeAcMgr, testPath));
+ JackrabbitAccessControlList acl = requireNonNull(AccessControlUtils.getAccessControlList(compositeAcMgr, testPath));
acl.addAccessControlEntry(unsupportedPrincipal, privilegesFromNames(PrivilegeConstants.REP_REMOVE_PROPERTIES));
compositeAcMgr.setPolicy(acl.getPath(), acl);
- PrincipalAccessControlList pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal));
+ PrincipalAccessControlList pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal));
pacl.addEntry(testPath, privilegesFromNames(PrivilegeConstants.REP_ADD_PROPERTIES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
root.commit();
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L3_PermissionEvaluationTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L3_PermissionEvaluationTest.java
index eaea0e37d9..cc887fc12c 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L3_PermissionEvaluationTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L3_PermissionEvaluationTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import java.security.Principal;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_MODIFY_PROPERTIES;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_READ;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_READ_ACCESS_CONTROL;
@@ -127,11 +127,11 @@ public class L3_PermissionEvaluationTest extends AbstractPrincipalBasedTest {
private void setupAccessControl() throws Exception {
JackrabbitAccessControlManager compositeAcMgr = (JackrabbitAccessControlManager) getConfig(AuthorizationConfiguration.class).getAccessControlManager(root, getNamePathMapper());
- PrincipalAccessControlList pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, systemUserPrincipal1));
+ PrincipalAccessControlList pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, systemUserPrincipal1));
pacl.addEntry(testPath, privilegesFromNames(REP_READ_NODES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
- pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, systemUserPrincipal2));
+ pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, systemUserPrincipal2));
pacl.addEntry(testPath, privilegesFromNames(REP_READ_PROPERTIES, REP_ADD_PROPERTIES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L4_DisabledAggregationFilterTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L4_DisabledAggregationFilterTest.java
index 54eacddf19..52ec9a564a 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L4_DisabledAggregationFilterTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/L4_DisabledAggregationFilterTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import javax.jcr.security.AccessControlPolicy;
import java.security.Principal;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_MODIFY_PROPERTIES;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_READ_ACCESS_CONTROL;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_WRITE;
@@ -121,11 +121,11 @@ public class L4_DisabledAggregationFilterTest extends AbstractPrincipalBasedTest
private void setupAccessControl() throws Exception {
JackrabbitAccessControlManager compositeAcMgr = (JackrabbitAccessControlManager) getConfig(AuthorizationConfiguration.class).getAccessControlManager(root, getNamePathMapper());
- PrincipalAccessControlList pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal1));
+ PrincipalAccessControlList pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal1));
pacl.addEntry(testPath, privilegesFromNames(REP_READ_NODES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
- pacl = checkNotNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal2));
+ pacl = requireNonNull(getApplicablePrincipalAccessControlList(compositeAcMgr, supportedPrincipal2));
pacl.addEntry(testPath, privilegesFromNames(REP_READ_PROPERTIES, REP_ADD_PROPERTIES));
compositeAcMgr.setPolicy(pacl.getPath(), pacl);
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
index 52291baa54..8099673bf9 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.spi.state;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.junit.Assert.assertEquals;
@@ -230,7 +230,7 @@ public class NodeStoreTest extends OakBaseTest {
public void contentChanged(
@NotNull NodeState root, @NotNull CommitInfo info) {
if (root.getChildNode("test").hasChildNode("newNode")) {
- observedRoot.set(checkNotNull(root));
+ observedRoot.set(requireNonNull(root));
latch.countDown();
}
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
index 77eb9ec2b4..afe44b299f 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
import static org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler.createJcrConflictHandler;
@@ -134,14 +134,14 @@ public class Jcr {
@NotNull
public Jcr with(@NotNull Clusterable c) {
ensureRepositoryIsNotCreated();
- this.clusterable = checkNotNull(c);
+ this.clusterable = requireNonNull(c);
return this;
}
@NotNull
public final Jcr with(@NotNull RepositoryInitializer initializer) {
ensureRepositoryIsNotCreated();
- repositoryInitializers.add(checkNotNull(initializer));
+ repositoryInitializers.add(requireNonNull(initializer));
return this;
}
@@ -159,42 +159,42 @@ public class Jcr {
@NotNull
public final Jcr with(@NotNull QueryIndexProvider provider) {
ensureRepositoryIsNotCreated();
- queryIndexProviders.add(checkNotNull(provider));
+ queryIndexProviders.add(requireNonNull(provider));
return this;
}
@NotNull
public final Jcr with(@NotNull IndexEditorProvider indexEditorProvider) {
ensureRepositoryIsNotCreated();
- indexEditorProviders.add(checkNotNull(indexEditorProvider));
+ indexEditorProviders.add(requireNonNull(indexEditorProvider));
return this;
}
@NotNull
public final Jcr with(@NotNull CommitHook hook) {
ensureRepositoryIsNotCreated();
- commitHooks.add(checkNotNull(hook));
+ commitHooks.add(requireNonNull(hook));
return this;
}
@NotNull
public final Jcr with(@NotNull EditorProvider provider) {
ensureRepositoryIsNotCreated();
- editorProviders.add(checkNotNull(provider));
+ editorProviders.add(requireNonNull(provider));
return this;
}
@NotNull
public final Jcr with(@NotNull Editor editor) {
ensureRepositoryIsNotCreated();
- editors.add(checkNotNull(editor));
+ editors.add(requireNonNull(editor));
return this;
}
@NotNull
public final Jcr with(@NotNull SecurityProvider securityProvider) {
ensureRepositoryIsNotCreated();
- this.securityProvider = checkNotNull(securityProvider);
+ this.securityProvider = requireNonNull(securityProvider);
return this;
}
@@ -210,28 +210,28 @@ public class Jcr {
@NotNull
public final Jcr with(@NotNull ThreeWayConflictHandler conflictHandler) {
ensureRepositoryIsNotCreated();
- this.conflictHandler.addHandler(checkNotNull(conflictHandler));
+ this.conflictHandler.addHandler(requireNonNull(conflictHandler));
return this;
}
@NotNull
public final Jcr with(@NotNull ScheduledExecutorService executor) {
ensureRepositoryIsNotCreated();
- this.scheduledExecutor = checkNotNull(executor);
+ this.scheduledExecutor = requireNonNull(executor);
return this;
}
@NotNull
public final Jcr with(@NotNull Executor executor) {
ensureRepositoryIsNotCreated();
- this.executor = checkNotNull(executor);
+ this.executor = requireNonNull(executor);
return this;
}
@NotNull
public final Jcr with(@NotNull Observer observer) {
ensureRepositoryIsNotCreated();
- observers.add(checkNotNull(observer));
+ observers.add(requireNonNull(observer));
return this;
}
@@ -263,14 +263,14 @@ public class Jcr {
@NotNull
public Jcr with(@NotNull CommitRateLimiter commitRateLimiter) {
ensureRepositoryIsNotCreated();
- this.commitRateLimiter = checkNotNull(commitRateLimiter);
+ this.commitRateLimiter = requireNonNull(commitRateLimiter);
return this;
}
@NotNull
public Jcr with(@NotNull QueryLimits qs) {
ensureRepositoryIsNotCreated();
- this.queryEngineSettings = checkNotNull(qs);
+ this.queryEngineSettings = requireNonNull(qs);
return this;
}
@@ -284,14 +284,14 @@ public class Jcr {
@NotNull
public Jcr with(@NotNull String defaultWorkspaceName) {
ensureRepositoryIsNotCreated();
- this.defaultWorkspaceName = checkNotNull(defaultWorkspaceName);
+ this.defaultWorkspaceName = requireNonNull(defaultWorkspaceName);
return this;
}
@NotNull
public Jcr with(@NotNull Whiteboard whiteboard) {
ensureRepositoryIsNotCreated();
- this.whiteboard = checkNotNull(whiteboard);
+ this.whiteboard = requireNonNull(whiteboard);
return this;
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java
index 0bc5280e82..7b53883391 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/ItemDelegate.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.jcr.delegate;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import javax.jcr.InvalidItemStateException;
import javax.jcr.RepositoryException;
@@ -42,7 +42,7 @@ public abstract class ItemDelegate {
private long updateCount;
ItemDelegate(SessionDelegate sessionDelegate) {
- this.sessionDelegate = checkNotNull(sessionDelegate);
+ this.sessionDelegate = requireNonNull(sessionDelegate);
this.updateCount = sessionDelegate.getUpdateCount();
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java
index 5fe94d6e9a..4d04f10a0f 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.jcr.delegate;
import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import javax.jcr.InvalidItemStateException;
import javax.jcr.ValueFormatException;
@@ -49,8 +49,8 @@ public class PropertyDelegate extends ItemDelegate {
PropertyDelegate(SessionDelegate sessionDelegate, Tree parent, String name) {
super(sessionDelegate);
- this.parent = checkNotNull(parent);
- this.name = checkNotNull(name);
+ this.parent = requireNonNull(parent);
+ this.name = requireNonNull(name);
this.state = parent.getProperty(name);
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
index e1db04b60c..1386b7a59c 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.delegate;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -157,17 +157,17 @@ public class SessionDelegate {
@NotNull ThreadLocal<Long> threadSaveCount,
@NotNull StatisticManager statisticManager,
@NotNull Clock clock) {
- this.contentSession = checkNotNull(contentSession);
- this.securityProvider = checkNotNull(securityProvider);
+ this.contentSession = requireNonNull(contentSession);
+ this.securityProvider = requireNonNull(securityProvider);
this.root = contentSession.getLatestRoot();
this.namespaces = new SessionNamespaces(this.root);
- this.saveCountRefresh = new SaveCountRefresh(checkNotNull(threadSaveCount));
- this.refreshStrategy = Composite.create(checkNotNull(refreshStrategy),
+ this.saveCountRefresh = new SaveCountRefresh(requireNonNull(threadSaveCount));
+ this.refreshStrategy = Composite.create(requireNonNull(refreshStrategy),
refreshAtNextAccess, saveCountRefresh, new RefreshNamespaces(
namespaces));
this.idManager = new IdentifierManager(root);
- this.clock = checkNotNull(clock);
- checkNotNull(statisticManager);
+ this.clock = requireNonNull(clock);
+ requireNonNull(statisticManager);
this.sessionStats = new SessionStats(contentSession.toString(),
contentSession.getAuthInfo(), clock, refreshStrategy, this, statisticManager);
this.sessionCounters = sessionStats.getCounters();
@@ -632,7 +632,7 @@ public class SessionDelegate {
if (root instanceof PermissionAware) {
permissionProvider = ((PermissionAware) root).getPermissionProvider();
} else {
- permissionProvider = checkNotNull(securityProvider)
+ permissionProvider = requireNonNull(securityProvider)
.getConfiguration(AuthorizationConfiguration.class)
.getPermissionProvider(root, getWorkspaceName(), getAuthInfo().getPrincipals());
refreshPermissionProvider = true;
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
index 655c068ea2..172a3f2a7d 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.jcr.delegate;
import java.util.List;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PREDECESSORS;
import javax.jcr.RepositoryException;
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.guava.common.collect.Lists;
public class VersionDelegate extends NodeDelegate {
private VersionDelegate(SessionDelegate sessionDelegate, Tree tree) {
- super(checkNotNull(sessionDelegate), checkNotNull(tree));
+ super(requireNonNull(sessionDelegate), requireNonNull(tree));
}
static VersionDelegate create(@NotNull SessionDelegate sessionDelegate,
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
index 95e05e13b3..baddafb3e5 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
/**
@@ -49,7 +49,7 @@ public class VersionHistoryDelegate extends NodeDelegate {
VersionHistoryDelegate(@NotNull SessionDelegate sessionDelegate,
@NotNull Tree vhTree) {
- super(sessionDelegate, checkNotNull(vhTree));
+ super(sessionDelegate, requireNonNull(vhTree));
}
public String getVersionableIdentifier() throws InvalidItemStateException {
@@ -77,7 +77,7 @@ public class VersionHistoryDelegate extends NodeDelegate {
@NotNull
public VersionDelegate getVersion(@NotNull String versionName)
throws VersionException, RepositoryException {
- checkNotNull(versionName);
+ requireNonNull(versionName);
Tree version = getTree().getChild(versionName);
if (!version.exists()) {
throw new VersionException("No such Version: " + versionName);
@@ -88,7 +88,7 @@ public class VersionHistoryDelegate extends NodeDelegate {
@NotNull
public VersionDelegate getVersionByLabel(@NotNull String label)
throws VersionException, RepositoryException {
- checkNotNull(label);
+ requireNonNull(label);
Tree versionLabels = getVersionLabelsTree();
PropertyState p = versionLabels.getProperty(label);
if (p == null) {
@@ -117,7 +117,7 @@ public class VersionHistoryDelegate extends NodeDelegate {
@NotNull
public Iterable<String> getVersionLabels(@NotNull String identifier)
throws RepositoryException {
- checkNotNull(identifier);
+ requireNonNull(identifier);
Tree versionLabels = getVersionLabelsTree();
List<String> labels = new ArrayList<String>();
for (PropertyState p : versionLabels.getProperties()) {
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java
index 4c25d6c4cd..47560fe907 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionManagerDelegate.java
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.jcr.version.ReadWriteVersionManager;
import org.apache.jackrabbit.oak.jcr.version.VersionStorage;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENMIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENPRIMARYTYPE;
@@ -179,10 +179,10 @@ public final class VersionManagerDelegate {
Root fresh = sessionDelegate.getContentSession().getLatestRoot();
VersionStorage storage = new VersionStorage(fresh);
String vhRelPath = PathUtils.relativize(VersionStorage.VERSION_STORAGE_PATH,
- checkNotNull(versionHistory).getPath());
+ requireNonNull(versionHistory).getPath());
versionManager.addVersionLabel(storage, vhRelPath,
- checkNotNull(version).getIdentifier(),
- checkNotNull(oakVersionLabel),
+ requireNonNull(version).getIdentifier(),
+ requireNonNull(oakVersionLabel),
moveLabel);
}
@@ -203,9 +203,9 @@ public final class VersionManagerDelegate {
Root fresh = sessionDelegate.getContentSession().getLatestRoot();
VersionStorage storage = new VersionStorage(fresh);
String vhRelPath = PathUtils.relativize(VersionStorage.VERSION_STORAGE_PATH,
- checkNotNull(versionHistory).getPath());
+ requireNonNull(versionHistory).getPath());
versionManager.removeVersionLabel(storage, vhRelPath,
- checkNotNull(oakVersionLabel));
+ requireNonNull(oakVersionLabel));
}
/**
@@ -222,7 +222,7 @@ public final class VersionManagerDelegate {
Root fresh = sessionDelegate.getContentSession().getLatestRoot();
VersionStorage storage = new VersionStorage(fresh);
String vhRelPath = PathUtils.relativize(VersionStorage.VERSION_STORAGE_PATH,
- checkNotNull(versionHistory).getPath());
+ requireNonNull(versionHistory).getPath());
versionManager.removeVersion(storage, vhRelPath, oakVersionName);
}
@@ -238,7 +238,7 @@ public final class VersionManagerDelegate {
@NotNull
private static Tree getTree(@NotNull NodeDelegate nodeDelegate)
throws InvalidItemStateException {
- return checkNotNull(nodeDelegate).getTree();
+ return requireNonNull(nodeDelegate).getTree();
}
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
index eb25b43fc1..b6942ce50d 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/WorkspaceDelegate.java
@@ -45,7 +45,7 @@ import org.apache.jackrabbit.util.Text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
@@ -59,7 +59,7 @@ public class WorkspaceDelegate {
private final SessionContext context;
public WorkspaceDelegate(SessionContext context) {
- this.context = checkNotNull(context);
+ this.context = requireNonNull(context);
}
/**
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java
index bb0c67d18a..14c0969d3f 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.lock;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -39,8 +39,8 @@ public final class LockImpl implements Lock {
private final NodeDelegate delegate;
public LockImpl(@NotNull SessionContext context, @NotNull NodeDelegate delegate) {
- this.context = checkNotNull(context);
- this.delegate = checkNotNull(delegate);
+ this.context = requireNonNull(context);
+ this.delegate = requireNonNull(delegate);
}
@Override
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
index 6a9fcde230..3a7bcb03bf 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.jcr.observation;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.api.stats.RepositoryStatistics.Type.OBSERVATION_EVENT_COUNTER;
@@ -487,9 +487,9 @@ class ChangeProcessor implements FilteringAwareObserver {
public void contentChanged(@NotNull NodeState before,
@NotNull NodeState after,
@NotNull CommitInfo info) {
- checkNotNull(before); // OAK-5160 before is now guaranteed to be non-null
- checkNotNull(after);
- checkNotNull(info);
+ requireNonNull(before); // OAK-5160 before is now guaranteed to be non-null
+ requireNonNull(after);
+ requireNonNull(info);
try {
long start = PERF_LOGGER.start();
FilterProvider provider = filterProvider.get();
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
index 2de031b591..c3ede017f9 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
@@ -61,7 +61,7 @@ import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.stats.TimeSeriesStatsUtil;
import org.osgi.framework.BundleContext;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
@Component(reference = {
@@ -313,7 +313,7 @@ public class ConsolidatedListenerMBeanImpl implements ConsolidatedListenerMBean
} else if (value instanceof ObjectName) {
name = (ObjectName) value;
}
- return checkNotNull(name, "No 'jmx.objectname' property defined for MBean %s", config);
+ return requireNonNull(name, String.format("No 'jmx.objectname' property defined for MBean %s", config));
}
private static String getListenerId(ObjectName name){
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
index 55b8685d0b..ae30b57d03 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/OakEventFilterImpl.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.jcr.observation;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static javax.jcr.observation.Event.NODE_REMOVED;
@@ -248,7 +248,7 @@ public class OakEventFilterImpl extends OakEventFilter {
private Set<String> relativeGlobPaths;
public OakEventFilterImpl(@NotNull JackrabbitEventFilter delegate) {
- checkNotNull(delegate);
+ requireNonNull(delegate);
this.delegate = delegate;
}
@@ -506,7 +506,7 @@ public class OakEventFilterImpl extends OakEventFilter {
}
public OakEventFilterImpl aggregator(EventAggregator aggregator) {
- checkNotNull(aggregator);
+ requireNonNull(aggregator);
this.aggregator = aggregator;
return this;
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
index 12ad5f7f87..0e53381db6 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.repository;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
@@ -162,9 +162,9 @@ public class RepositoryImpl implements JackrabbitRepository {
CommitRateLimiter commitRateLimiter,
boolean fastQueryResultSize,
boolean createSessionMBeans) {
- this.contentRepository = checkNotNull(contentRepository);
- this.whiteboard = checkNotNull(whiteboard);
- this.securityProvider = checkNotNull(securityProvider);
+ this.contentRepository = requireNonNull(contentRepository);
+ this.whiteboard = requireNonNull(whiteboard);
+ this.securityProvider = requireNonNull(securityProvider);
this.observationQueueLength = observationQueueLength;
this.commitRateLimiter = commitRateLimiter;
this.descriptors = determineDescriptors();
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
index b9b992c636..64339541ba 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.session;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
import static java.lang.String.format;
@@ -982,7 +982,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
@Override
public void setPrimaryType(final String nodeTypeName) throws RepositoryException {
- final String oakTypeName = getOakName(checkNotNull(nodeTypeName));
+ final String oakTypeName = getOakName(requireNonNull(nodeTypeName));
sessionDelegate.performVoid(new ItemWriteOperation<Void>("setPrimaryType") {
@Override
public void checkPreconditions() throws RepositoryException {
@@ -1001,7 +1001,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
@Override
public void addMixin(String mixinName) throws RepositoryException {
- final String oakTypeName = getOakName(checkNotNull(mixinName));
+ final String oakTypeName = getOakName(requireNonNull(mixinName));
if (JcrConstants.MIX_LOCKABLE.equals(oakTypeName)) {
LockDeprecation.handleCall("addMixin " + JcrConstants.MIX_LOCKABLE);
}
@@ -1023,7 +1023,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
@Override
public void removeMixin(final String mixinName) throws RepositoryException {
- final String oakTypeName = getOakName(checkNotNull(mixinName));
+ final String oakTypeName = getOakName(requireNonNull(mixinName));
sessionDelegate.performVoid(new ItemWriteOperation<Void>("removeMixin") {
@Override
public void checkPreconditions() throws RepositoryException {
@@ -1425,7 +1425,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
private Property internalSetProperty(
final String jcrName, final Value value, final boolean exactTypeMatch)
throws RepositoryException {
- final String oakName = getOakPathOrThrow(checkNotNull(jcrName));
+ final String oakName = getOakPathOrThrow(requireNonNull(jcrName));
final PropertyState state = createSingleState(
oakName, value, Type.fromTag(value.getType(), false));
if (value.getType() == PropertyType.STRING) {
@@ -1465,7 +1465,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
final String jcrName, final Value[] values,
final int type, final boolean exactTypeMatch)
throws RepositoryException {
- final String oakName = getOakPathOrThrow(checkNotNull(jcrName));
+ final String oakName = getOakPathOrThrow(requireNonNull(jcrName));
final PropertyState state = createMultiState(
oakName, compact(values), Type.fromTag(type, true));
@@ -1520,7 +1520,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
private Property internalRemoveProperty(final String jcrName)
throws RepositoryException {
- final String oakName = getOakName(checkNotNull(jcrName));
+ final String oakName = getOakName(requireNonNull(jcrName));
return perform(new ItemWriteOperation<Property>("internalRemoveProperty") {
@Override
public void checkPreconditions() throws RepositoryException {
@@ -1648,7 +1648,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
public void setMixins(String[] mixinNames) throws RepositoryException {
final Set<String> oakTypeNames = newLinkedHashSet();
for (String mixinName : mixinNames) {
- oakTypeNames.add(getOakName(checkNotNull(mixinName)));
+ oakTypeNames.add(getOakName(requireNonNull(mixinName)));
}
sessionDelegate.performVoid(new ItemWriteOperation<Void>("setMixins") {
@Override
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
index 5221ef41c9..57e721a481 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.session;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.newTreeSet;
import static org.apache.jackrabbit.oak.plugins.value.jcr.PartialValueFactory.DEFAULT_BLOB_ACCESS_PROVIDER;
@@ -134,12 +134,12 @@ public class SessionContext implements NamePathMapper {
int observationQueueLength, CommitRateLimiter commitRateLimiter,
MountInfoProvider mountInfoProvider, @Nullable BlobAccessProvider blobAccessProvider,
@Nullable SessionQuerySettings sessionQuerySettings) {
- this.repository = checkNotNull(repository);
+ this.repository = requireNonNull(repository);
this.statisticManager = statisticManager;
- this.securityProvider = checkNotNull(securityProvider);
- this.whiteboard = checkNotNull(whiteboard);
- this.attributes = checkNotNull(attributes);
- this.delegate = checkNotNull(delegate);
+ this.securityProvider = requireNonNull(securityProvider);
+ this.whiteboard = requireNonNull(whiteboard);
+ this.attributes = requireNonNull(attributes);
+ this.delegate = requireNonNull(delegate);
this.observationQueueLength = observationQueueLength;
this.commitRateLimiter = commitRateLimiter;
this.mountInfoProvider = mountInfoProvider;
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/FrozenNodeLogger.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/FrozenNodeLogger.java
index 36649bb408..eeb3a0365a 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/FrozenNodeLogger.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/FrozenNodeLogger.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.NT_FROZENNODE;
import static org.apache.jackrabbit.oak.spi.toggle.Feature.newFeature;
@@ -59,7 +59,7 @@ public class FrozenNodeLogger implements Closeable {
public FrozenNodeLogger(@NotNull Clock clock,
@NotNull Whiteboard whiteboard) {
- this.clock = checkNotNull(clock);
+ this.clock = requireNonNull(clock);
this.feature = newFeature("OAK-9139_log_frozen_node_lookup", whiteboard);
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
index a5bcf77710..c58d93f2cc 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ReadWriteVersionManager.java
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.util.ISO8601;
import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.JcrConstants.JCR_CREATED;
import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT;
@@ -185,10 +185,10 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
@NotNull String versionIdentifier,
@NotNull String oakVersionLabel,
boolean moveLabel) throws RepositoryException {
- Tree versionHistory = TreeUtil.getTree(checkNotNull(versionStorage.getTree()),
- checkNotNull(versionHistoryOakRelPath));
- Tree labels = checkNotNull(versionHistory).getChild(JCR_VERSIONLABELS);
- PropertyState existing = labels.getProperty(checkNotNull(oakVersionLabel));
+ Tree versionHistory = TreeUtil.getTree(requireNonNull(versionStorage.getTree()),
+ requireNonNull(versionHistoryOakRelPath));
+ Tree labels = requireNonNull(versionHistory).getChild(JCR_VERSIONLABELS);
+ PropertyState existing = labels.getProperty(requireNonNull(oakVersionLabel));
if (existing != null) {
if (moveLabel) {
labels.removeProperty(existing.getName());
@@ -211,9 +211,9 @@ public class ReadWriteVersionManager extends ReadOnlyVersionManager {
@NotNull String versionHistoryOakRelPath,
@NotNull String oakVersionLabel)
throws RepositoryException {
- Tree versionHistory = TreeUtil.getTree(checkNotNull(versionStorage.getTree()),
- checkNotNull(versionHistoryOakRelPath));
- Tree labels = checkNotNull(versionHistory).getChild(JCR_VERSIONLABELS);
+ Tree versionHistory = TreeUtil.getTree(requireNonNull(versionStorage.getTree()),
+ requireNonNull(versionHistoryOakRelPath));
+ Tree labels = requireNonNull(versionHistory).getChild(JCR_VERSIONLABELS);
if (!labels.hasProperty(oakVersionLabel)) {
throw new VersionException("Version label " + oakVersionLabel +
" does not exist on this version history");
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java
index 878641a98f..cc6d30e88f 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.version;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.ArrayList;
import java.util.Calendar;
@@ -179,7 +179,7 @@ public class VersionImpl extends NodeImpl<VersionDelegate> implements Version {
@NotNull
private PropertyDelegate getPropertyOrThrow(@NotNull String name)
throws RepositoryException {
- PropertyDelegate p = dlg.getPropertyOrNull(checkNotNull(name));
+ PropertyDelegate p = dlg.getPropertyOrNull(requireNonNull(name));
if (p == null) {
throw new RepositoryException("Inconsistent version storage. " +
"Version does not have a " + name + " property.");
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
index 9e64444248..827a5701fd 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.version;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.ArrayList;
import java.util.Collections;
@@ -417,8 +417,8 @@ public class VersionManagerImpl implements VersionManager {
@NotNull String absPath)
throws PathNotFoundException {
String oakParentPath = getOakPathOrThrowNotFound(
- PathUtils.getParentPath(checkNotNull(absPath)));
- NodeDelegate parent = checkNotNull(sessionDelegate).getNode(oakParentPath);
+ PathUtils.getParentPath(requireNonNull(absPath)));
+ NodeDelegate parent = requireNonNull(sessionDelegate).getNode(oakParentPath);
if (parent == null) {
throw new PathNotFoundException(PathUtils.getParentPath(absPath));
}
@@ -514,7 +514,7 @@ public class VersionManagerImpl implements VersionManager {
@NotNull String absPathVersionable)
throws RepositoryException, UnsupportedRepositoryOperationException {
SessionDelegate sessionDelegate = sessionContext.getSessionDelegate();
- String oakPath = getOakPathOrThrowNotFound(checkNotNull(absPathVersionable));
+ String oakPath = getOakPathOrThrowNotFound(requireNonNull(absPathVersionable));
NodeDelegate nodeDelegate = sessionDelegate.getNode(oakPath);
if (nodeDelegate == null) {
throw new PathNotFoundException(absPathVersionable);
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
index a8fa27df83..022abd4f12 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionStorage.java
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Simple abstraction of the version storage.
@@ -67,7 +67,7 @@ public class VersionStorage {
*/
private static Tree getVersionStorageTree(@NotNull Root workspaceRoot) {
// TODO: this assumes the version store is in the same workspace.
- return checkNotNull(workspaceRoot).getTree(VERSION_STORAGE_PATH);
+ return requireNonNull(workspaceRoot).getTree(VERSION_STORAGE_PATH);
}
}
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
index 141f901bb5..681d64961b 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditor.PROP_COUNTER;
import static org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditor.PROP_INCREMENT;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.MIX_ATOMIC_COUNTER;
@@ -95,8 +95,8 @@ public class AtomicCounterIT extends AbstractRepositoryTest {
private ListenableFutureTask<Void> updateCounter(@NotNull final String counterPath,
final long delta,
@NotNull final AtomicLong expected) {
- checkNotNull(counterPath);
- checkNotNull(expected);
+ requireNonNull(counterPath);
+ requireNonNull(expected);
ListenableFutureTask<Void> task = ListenableFutureTask.create(new Callable<Void>() {
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java
index 851797d844..4b3bf35dc7 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditor.PROP_COUNTER;
import static org.apache.jackrabbit.oak.plugins.atomic.AtomicCounterEditor.PROP_INCREMENT;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.MIX_ATOMIC_COUNTER;
@@ -84,7 +84,7 @@ public class AtomicCounterTest extends AbstractRepositoryTest {
private static void assertCounter(@NotNull final Node counter, final long expectedCount)
throws RepositoryException {
- checkNotNull(counter);
+ requireNonNull(counter);
assertTrue(counter.hasProperty(PROP_COUNTER));
assertEquals(expectedCount, counter.getProperty(PROP_COUNTER).getLong());
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
index 439659be26..e24919ba5f 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.ArrayList;
import java.util.Collections;
@@ -80,7 +80,7 @@ public abstract class DocumentClusterIT {
}
protected void dispose(@NotNull Repository repo) {
- AbstractRepositoryTest.dispose(checkNotNull(repo));
+ AbstractRepositoryTest.dispose(requireNonNull(repo));
}
@After
@@ -172,11 +172,11 @@ public abstract class DocumentClusterIT {
static MongoConnection createConnection(@NotNull final Class<?> clazz) throws Exception {
return OakMongoNSRepositoryStub.createConnection(
- checkNotNull(clazz).getSimpleName());
+ requireNonNull(clazz).getSimpleName());
}
static void dropDB(@NotNull final Class<?> clazz) throws Exception {
- MongoConnection con = createConnection(checkNotNull(clazz));
+ MongoConnection con = createConnection(requireNonNull(clazz));
try {
con.getDatabase().drop();
} finally {
@@ -200,7 +200,7 @@ public abstract class DocumentClusterIT {
final int clusterId,
final int asyncDelay) throws Exception {
DocumentMK.Builder builder = new DocumentMK.Builder();
- MongoConnection c = createConnection(checkNotNull(clazz));
+ MongoConnection c = createConnection(requireNonNull(clazz));
builder.setMongoDB(c.getMongoClient(), c.getDBName());
if (asyncDelay != NOT_PROVIDED) {
builder.setAsyncDelay(asyncDelay);
@@ -223,12 +223,12 @@ public abstract class DocumentClusterIT {
Repository repository = j.createRepository();
- checkNotNull(repos).add(repository);
- checkNotNull(mks).add(mk);
+ requireNonNull(repos).add(repository);
+ requireNonNull(mks).add(mk);
}
protected Jcr getJcr(@NotNull NodeStore store) {
- Jcr j = new Jcr(checkNotNull(store));
+ Jcr j = new Jcr(requireNonNull(store));
if (store instanceof Clusterable) {
j.with((Clusterable) store);
}
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
index a4b85b9681..52939a0980 100755
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportTest.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -257,7 +257,7 @@ public class GroupImportTest extends AbstractImportTest {
@Test
public void testImportMembers() throws Exception {
Session s = getImportSession();
- Authorizable admin = checkNotNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
+ Authorizable admin = requireNonNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
String uuid = s.getNode(admin.getPath()).getUUID();
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"gFolder\" xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\" xmlns:fn=\"http://www.w3.org/2005/xpath-functions\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:rep=\"internal\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\">" +
@@ -290,7 +290,7 @@ public class GroupImportTest extends AbstractImportTest {
@Test
public void testImportMembersWithIdDifferentFromNodeName() throws Exception {
Session s = getImportSession();
- Authorizable admin = checkNotNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
+ Authorizable admin = requireNonNull(getUserManager().getAuthorizable(UserConstants.DEFAULT_ADMIN_ID));
String uuid = s.getNode(admin.getPath()).getUUID();
// deliberately put the 'rep:members' before the 'rep:authorizableId' to cover OAK-2367
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
index 198b614de9..6f64434fe9 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_RUNNING;
@@ -119,13 +119,13 @@ public class ActiveDeletedBlobCollectorMBeanImpl implements ActiveDeletedBlobCol
@NotNull AsyncIndexInfoService asyncIndexInfoService,
@NotNull GarbageCollectableBlobStore blobStore,
@NotNull Executor executor) {
- this.activeDeletedBlobCollector = checkNotNull(activeDeletedBlobCollector);
- this.whiteboard = checkNotNull(whiteboard);
+ this.activeDeletedBlobCollector = requireNonNull(activeDeletedBlobCollector);
+ this.whiteboard = requireNonNull(whiteboard);
this.store = store;
this.indexPathService = indexPathService;
this.asyncIndexInfoService = asyncIndexInfoService;
- this.blobStore = checkNotNull(blobStore);
- this.executor = checkNotNull(executor);
+ this.blobStore = requireNonNull(blobStore);
+ this.executor = requireNonNull(executor);
LOG.info("Active blob collector initialized with minAge: {}", MIN_BLOB_AGE_TO_ACTIVELY_DELETE);
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
index b54a0c4253..78348013e3 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.in;
import static org.apache.jackrabbit.guava.common.base.Predicates.not;
import static org.apache.jackrabbit.guava.common.base.Predicates.notNull;
@@ -245,7 +245,7 @@ public class IndexTracker {
LuceneIndexNodeManager index = indices.get(path);
if (index != null) {
LuceneIndexNode indexNode = index.acquire();
- return checkNotNull(indexNode);
+ return requireNonNull(indexNode);
}
if (badIndexTracker.isIgnoredBadIndex(path)){
@@ -262,7 +262,7 @@ public class IndexTracker {
index = LuceneIndexNodeManager.open(path, root, node, readerFactory, nrtFactory);
if (index != null) {
LuceneIndexNode indexNode = index.acquire();
- checkNotNull(indexNode);
+ requireNonNull(indexNode);
indices = ImmutableMap.<String, LuceneIndexNodeManager>builder()
.putAll(indices)
.put(path, index)
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
index 9790378742..0c80e20cd1 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
@@ -60,7 +60,7 @@ import java.util.LinkedList;
import java.util.List;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
/**
@@ -136,7 +136,7 @@ public class LuceneIndexEditorProvider implements IndexEditorProvider {
this.indexTracker = indexTracker;
this.extractedTextCache = extractedTextCache != null ? extractedTextCache : new ExtractedTextCache(0, 0);
this.augmentorFactory = augmentorFactory;
- this.mountInfoProvider = checkNotNull(mountInfoProvider);
+ this.mountInfoProvider = requireNonNull(mountInfoProvider);
this.activeDeletedBlobCollector = activeDeletedBlobCollector;
this.mbean = mbean;
this.statisticsProvider = statisticsProvider;
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java
index 91d47c333b..69e8269ed5 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.INDEX_DEFINITION_NODE;
public class LuceneIndexInfoProvider implements IndexInfoProvider {
@@ -63,9 +63,9 @@ public class LuceneIndexInfoProvider implements IndexInfoProvider {
private final File workDir;
public LuceneIndexInfoProvider(NodeStore nodeStore, AsyncIndexInfoService asyncInfoService, File workDir) {
- this.nodeStore = checkNotNull(nodeStore);
- this.asyncInfoService = checkNotNull(asyncInfoService);
- this.workDir = checkNotNull(workDir);
+ this.nodeStore = requireNonNull(nodeStore);
+ this.asyncInfoService = requireNonNull(asyncInfoService);
+ this.workDir = requireNonNull(workDir);
}
@Override
@@ -111,8 +111,7 @@ public class LuceneIndexInfoProvider implements IndexInfoProvider {
}
AsyncIndexInfo asyncInfo = asyncInfoService.getInfo(asyncName);
- checkNotNull(asyncInfo, "No async info found for name [%s] " +
- "for index at [%s]", asyncName, indexPath);
+ requireNonNull(asyncInfo, String.format("No async info found for name [%s] for index at [%s]", asyncName, indexPath));
info.indexedUptoTime = asyncInfo.getLastIndexedTo();
info.asyncName = asyncName;
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java
index c6f855997b..4398c5e412 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static org.apache.jackrabbit.oak.plugins.index.lucene.TermFactory.newAncestorTerm;
import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryUtils.dirSize;
@@ -110,10 +110,10 @@ public class LuceneIndexMBeanImpl extends AnnotatedStandardMBean implements Luce
public LuceneIndexMBeanImpl(IndexTracker indexTracker, NodeStore nodeStore, IndexPathService indexPathService, File workDir, @Nullable PropertyIndexCleaner cleaner) {
super(LuceneIndexMBean.class);
- this.indexTracker = checkNotNull(indexTracker);
- this.nodeStore = checkNotNull(nodeStore);
+ this.indexTracker = requireNonNull(indexTracker);
+ this.nodeStore = requireNonNull(nodeStore);
this.indexPathService = indexPathService;
- this.workDir = checkNotNull(workDir);
+ this.workDir = requireNonNull(workDir);
this.propertyIndexCleaner = cleaner;
}
@@ -440,7 +440,7 @@ public class LuceneIndexMBeanImpl extends AnnotatedStandardMBean implements Luce
if (indexNode != null) {
log.info("Dumping Lucene directory content for [{}] to [{}]", sourcePath, destPath);
Directory source = getDirectory(getPrimaryReader(indexNode.getPrimaryReaders()));
- checkNotNull(source, "IndexSearcher not backed by DirectoryReader");
+ requireNonNull(source, "IndexSearcher not backed by DirectoryReader");
Directory dest = FSDirectory.open(new File(destPath));
for (String file : source.listAll()) {
source.copy(dest, file, file, IOContext.DEFAULT);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
index 29528e1ee8..255d8f472e 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
@@ -95,7 +95,7 @@ import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static org.apache.commons.io.FileUtils.ONE_MB;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
@@ -425,7 +425,7 @@ public class LuceneIndexProviderService {
}
private File getIndexCheckDir() {
- return new File(checkNotNull(indexDir), "indexCheckDir");
+ return new File(requireNonNull(indexDir), "indexCheckDir");
}
@Deactivate
@@ -485,8 +485,8 @@ public class LuceneIndexProviderService {
}
}
- checkNotNull(indexDirPath, "Index directory cannot be determined as neither index " +
- "directory path [%s] nor repository home [%s] defined", PROP_LOCAL_INDEX_DIR, REPOSITORY_HOME);
+ requireNonNull(indexDirPath, String.format("Index directory cannot be determined as neither index " +
+ "directory path [%s] nor repository home [%s] defined", PROP_LOCAL_INDEX_DIR, REPOSITORY_HOME));
indexDir = new File(indexDirPath);
}
@@ -535,7 +535,7 @@ public class LuceneIndexProviderService {
editorProvider.withAsyncIndexesSizeStatsUpdate(asyncIndexesSizeStatsUpdate);
if (hybridIndex){
- editorProvider.setIndexingQueue(checkNotNull(documentQueue));
+ editorProvider.setIndexingQueue(requireNonNull(documentQueue));
}
Dictionary<String, Object> props = new Hashtable<>();
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
index 69421c0c4b..09ae2537ac 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
@@ -134,7 +134,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.base.Predicates.notNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
@@ -1024,8 +1024,8 @@ public class LucenePropertyIndex extends FulltextIndex {
* @return true if there where at least one unwrapped NOT. false otherwise.
*/
private static boolean unwrapMustNot(@NotNull BooleanQuery input, @NotNull BooleanQuery output) {
- checkNotNull(input);
- checkNotNull(output);
+ requireNonNull(input);
+ requireNonNull(output);
boolean unwrapped = false;
for (BooleanClause bc : input.getClauses()) {
if (bc.getOccur() == BooleanClause.Occur.MUST_NOT) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactory.java
index c3d5bbdc22..8662302435 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/NodeStateAnalyzerFactory.java
@@ -59,7 +59,7 @@ import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
/**
@@ -142,7 +142,7 @@ final class NodeStateAnalyzerFactory {
}
private TokenizerFactory loadTokenizer(NodeState state) {
- String clazz = checkNotNull(state.getString(FulltextIndexConstants.ANL_NAME));
+ String clazz = requireNonNull(state.getString(FulltextIndexConstants.ANL_NAME));
Map<String, String> args = convertNodeState(state);
TokenizerFactory tf = TokenizerFactory.forName(clazz, args);
init(tf, state);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
index 2f198f1347..64fc4521b7 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
@@ -117,9 +117,9 @@ public final class BufferedOakDirectory extends Directory {
BlobFactory.getBlobStoreBlobFactory(blobStore) :
BlobFactory.getNodeBuilderBlobFactory(builder);
this.blobDeletionCallback = blobDeletionCallback;
- this.dataNodeName = checkNotNull(dataNodeName);
- this.definition = checkNotNull(definition);
- this.base = new OakDirectory(checkNotNull(builder), dataNodeName,
+ this.dataNodeName = requireNonNull(dataNodeName);
+ this.definition = requireNonNull(definition);
+ this.base = new OakDirectory(requireNonNull(builder), dataNodeName,
definition, false, blobFactory, blobDeletionCallback, isEnableWritingSingleBlobIndexFile());
reopenBuffered();
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
index 5e152e3727..cca100bac1 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
@@ -58,7 +58,7 @@ import org.apache.lucene.store.IOContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
public class IndexConsistencyChecker {
@@ -217,9 +217,9 @@ public class IndexConsistencyChecker {
* would be left as is
*/
public IndexConsistencyChecker(NodeState rootState, String indexPath, File workDirRoot) {
- this.rootState = checkNotNull(rootState);
- this.indexPath = checkNotNull(indexPath);
- this.workDirRoot = checkNotNull(workDirRoot);
+ this.rootState = requireNonNull(rootState);
+ this.indexPath = requireNonNull(indexPath);
+ this.workDirRoot = requireNonNull(workDirRoot);
}
public void setPrintStream(PrintStream printStream) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java
index dfe3479bbc..3dc553ad99 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.commons.io.FileUtils;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Represents the index metadata file content as present in index-details.txt
@@ -62,8 +62,8 @@ final class IndexMeta implements Comparable<IndexMeta> {
public IndexMeta(File file) throws IOException {
Properties p = loadFromFile(file);
- this.indexPath = checkNotNull(p.getProperty("indexPath"));
- this.creationTime = Long.valueOf(checkNotNull(p.getProperty("creationTime")));
+ this.indexPath = requireNonNull(p.getProperty("indexPath"));
+ this.creationTime = Long.valueOf(requireNonNull(p.getProperty("creationTime")));
this.properties = new HashMap<>(Maps.fromProperties(p));
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
index cc07744746..025f16dda7 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
/**
@@ -152,7 +152,7 @@ public class IndexRootDirectory {
* correct local index directory (container dir) can be checked for deletion
*/
public long gcEmptyDirs(File subDir) throws IOException {
- File parent = checkNotNull(subDir).getParentFile().getCanonicalFile();
+ File parent = requireNonNull(subDir).getParentFile().getCanonicalFile();
LocalIndexDir indexDir = findMatchingIndexDir(parent);
long totalDeletedSize = 0;
if (indexDir != null) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
index f9d06a9220..4037346f88 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
@@ -33,7 +33,7 @@ import org.apache.lucene.store.DataInput;
import org.jetbrains.annotations.NotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
@@ -123,7 +123,7 @@ class OakBufferedIndexFile implements OakIndexFile {
this.blobSize = determineBlobSize(file);
this.uniqueKey = readUniqueKey(file);
this.blob = new byte[blobSize];
- this.blobFactory = checkNotNull(blobFactory);
+ this.blobFactory = requireNonNull(blobFactory);
PropertyState property = file.getProperty(JCR_DATA);
if (property != null && property.getType() == BINARIES) {
@@ -237,7 +237,7 @@ class OakBufferedIndexFile implements OakIndexFile {
@Override
public void readBytes(byte[] b, int offset, int len)
throws IOException {
- checkPositionIndexes(offset, offset + len, checkNotNull(b).length);
+ checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
if (len < 0 || position + len > length) {
String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
index e75de0f325..719585052e 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
@@ -97,7 +97,7 @@ class OakStreamingIndexFile implements OakIndexFile, AutoCloseable {
this.file = file;
this.dirDetails = dirDetails;
this.uniqueKey = readUniqueKey(file);
- this.blobFactory = checkNotNull(blobFactory);
+ this.blobFactory = requireNonNull(blobFactory);
PropertyState property = file.getProperty(JCR_DATA);
if (property != null) {
@@ -222,7 +222,7 @@ class OakStreamingIndexFile implements OakIndexFile, AutoCloseable {
@Override
public void readBytes(byte[] b, int offset, int len)
throws IOException {
- checkPositionIndexes(offset, offset + len, checkNotNull(b).length);
+ checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
if (len < 0 || position + len > length) {
String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java
index af18d43b3f..e1aa2b9933 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
class ExternalIndexObserver implements Observer, Filter {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -50,8 +50,8 @@ class ExternalIndexObserver implements Observer, Filter {
private final TimerStats timer;
public ExternalIndexObserver(IndexingQueue indexingQueue, IndexTracker indexTracker, StatisticsProvider statisticsProvider) {
- this.indexingQueue = checkNotNull(indexingQueue);
- this.indexTracker = checkNotNull(indexTracker);
+ this.indexingQueue = requireNonNull(indexingQueue);
+ this.indexTracker = requireNonNull(indexTracker);
this.added = statisticsProvider.getMeter("HYBRID_EXTERNAL_ADDED", StatsOptions.METRICS_ONLY);
this.timer = statisticsProvider.getTimer("HYBRID_EXTERNAL_TIME", StatsOptions.METRICS_ONLY);
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java
index ac7340b81a..8393ffdd60 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class ExternalObserverBuilder {
private static final Logger log = LoggerFactory.getLogger(ExternalIndexObserver.class);
@@ -47,10 +47,10 @@ public class ExternalObserverBuilder {
public ExternalObserverBuilder(IndexingQueue indexingQueue, IndexTracker indexTracker,
StatisticsProvider statisticsProvider,
Executor executor, int queueSize) {
- this.indexingQueue = checkNotNull(indexingQueue);
- this.indexTracker = checkNotNull(indexTracker);
- this.statisticsProvider = checkNotNull(statisticsProvider);
- this.executor = checkNotNull(executor);
+ this.indexingQueue = requireNonNull(indexingQueue);
+ this.indexTracker = requireNonNull(indexTracker);
+ this.statisticsProvider = requireNonNull(statisticsProvider);
+ this.executor = requireNonNull(executor);
this.queueSize = queueSize;
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/IndexedPaths.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/IndexedPaths.java
index 5d0f373f58..34d4f87288 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/IndexedPaths.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/IndexedPaths.java
@@ -28,13 +28,13 @@ import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.guava.common.collect.Multimap;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
class IndexedPaths implements JournalProperty, Iterable<IndexedPathInfo> {
private final Multimap<String, String> indexedPaths;
public IndexedPaths(Multimap<String, String> indexedPaths) {
- this.indexedPaths = checkNotNull(indexedPaths);
+ this.indexedPaths = requireNonNull(indexedPaths);
}
@Override
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
index 77bd1745ac..20f0e10326 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
import org.apache.lucene.index.IndexableField;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
class LuceneDoc implements LuceneDocInfo {
final String indexPath;
@@ -32,7 +32,7 @@ class LuceneDoc implements LuceneDocInfo {
private volatile boolean processed;
public static LuceneDoc forUpdate(String indexPath, String path, Iterable<? extends IndexableField> doc){
- return new LuceneDoc(indexPath, path, checkNotNull(doc), false);
+ return new LuceneDoc(indexPath, path, requireNonNull(doc), false);
}
public static LuceneDoc forDelete(String indexPath, String path){
@@ -40,8 +40,8 @@ class LuceneDoc implements LuceneDocInfo {
}
private LuceneDoc(String indexPath, String path, @Nullable Iterable<? extends IndexableField> doc, boolean delete) {
- this.docPath = checkNotNull(path);
- this.indexPath = checkNotNull(indexPath);
+ this.docPath = requireNonNull(path);
+ this.indexPath = requireNonNull(indexPath);
this.doc = doc;
this.delete = delete;
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
index 83375129d8..01a7d81b26 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class LuceneDocumentHolder implements JournalProperty {
private static final Logger log = LoggerFactory.getLogger(LuceneDocumentHolder.class);
@@ -48,7 +48,7 @@ public class LuceneDocumentHolder implements JournalProperty {
private boolean schedulingDone;
public LuceneDocumentHolder(@NotNull IndexingQueue documentQueue, int inMemoryDocsLimit) {
- this.documentQueue = checkNotNull(documentQueue);
+ this.documentQueue = requireNonNull(documentQueue);
this.inMemoryDocsLimit = inMemoryDocsLimit;
}
@@ -66,7 +66,7 @@ public class LuceneDocumentHolder implements JournalProperty {
}
public void add(boolean sync, LuceneDoc doc) {
- doc = checkNotNull(doc);
+ doc = requireNonNull(doc);
//First try adding to queue in non blocking manner
if (documentQueue.addIfNotFullWithoutWait(doc)){
if (sync){
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
index 0e02009cef..cb9d8c3505 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
@@ -54,7 +54,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryUtils.dirSize;
@@ -363,7 +363,7 @@ public class NRTIndex implements Closeable {
private final Directory directory;
public NRTReader(IndexReader indexReader, Directory directory) {
- this.indexReader = checkNotNull(indexReader);
+ this.indexReader = requireNonNull(indexReader);
this.directory = directory;
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
index d439b8fc8a..00fbb9053d 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
@@ -43,7 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class NRTIndexFactory implements Closeable{
/**
@@ -68,7 +68,7 @@ public class NRTIndexFactory implements Closeable{
public NRTIndexFactory(IndexCopier indexCopier, Clock clock, long refreshDeltaInSecs,
StatisticsProvider statisticsProvider) {
- this.indexCopier = checkNotNull(indexCopier);
+ this.indexCopier = requireNonNull(indexCopier);
this.clock = clock;
this.refreshDeltaInSecs = refreshDeltaInSecs;
this.statisticsProvider = statisticsProvider;
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java
index 81759798b8..c5860e5460 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleaner.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.property;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
@@ -83,9 +83,9 @@ public class PropertyIndexCleaner implements Runnable{
public PropertyIndexCleaner(NodeStore nodeStore, IndexPathService indexPathService,
AsyncIndexInfoService asyncIndexInfoService,
StatisticsProvider statsProvider) {
- this.nodeStore = checkNotNull(nodeStore);
- this.indexPathService = checkNotNull(indexPathService);
- this.asyncIndexInfoService = checkNotNull(asyncIndexInfoService);
+ this.nodeStore = requireNonNull(nodeStore);
+ this.indexPathService = requireNonNull(indexPathService);
+ this.asyncIndexInfoService = requireNonNull(asyncIndexInfoService);
this.cleanupTime = statsProvider.getTimer("HYBRID_PROPERTY_CLEANER", StatsOptions.METRICS_ONLY);
this.noopMeter = statsProvider.getMeter("HYBRID_PROPERTY_NOOP", StatsOptions.METRICS_ONLY);
@@ -315,7 +315,7 @@ public class PropertyIndexCleaner implements Runnable{
}
private static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
//Use getChildNode to avoid creating new entries by default
nb = nb.getChildNode(name);
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java
index d7e395da79..087b2a3546 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Suppliers.ofInstance;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.emptySet;
@@ -151,8 +151,8 @@ public class PropertyIndexUpdateCallback implements PropertyUpdateCallback {
}
String headBucketName = idx.getString(PROP_HEAD_BUCKET);
- checkNotNull(headBucketName, "[%s] property not found in [%s] for index [%s]",
- PROP_HEAD_BUCKET, idx, indexPath);
+ requireNonNull(headBucketName, String.format("[%s] property not found in [%s] for index [%s]",
+ PROP_HEAD_BUCKET, idx, indexPath));
return idx.child(headBucketName);
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java
index c968ef476c..eb74698683 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/UniquenessConstraintValidator.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
/**
@@ -84,7 +84,7 @@ public class UniquenessConstraintValidator {
}
public void setSecondStore(PropertyQuery secondStore) {
- this.secondStore = checkNotNull(secondStore);
+ this.secondStore = requireNonNull(secondStore);
}
private Iterable<String> getIndexedPaths(String propertyRelativePath, String value) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
index 6f4ad4d5ab..78a70b9f97 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/IndexDefinitionBuilder.java
@@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.spi.state.EqualsDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -120,12 +120,12 @@ public final class IndexDefinitionBuilder {
}
public IndexDefinitionBuilder codec(String codecName){
- tree.setProperty(LuceneIndexConstants.CODEC_NAME, checkNotNull(codecName));
+ tree.setProperty(LuceneIndexConstants.CODEC_NAME, requireNonNull(codecName));
return this;
}
public IndexDefinitionBuilder mergePolicy(String mergePolicy) {
- tree.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME, checkNotNull(mergePolicy));
+ tree.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME, requireNonNull(mergePolicy));
return this;
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
index 698bcf7829..3c9351cd3b 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLuceneFileIndexDefinition;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLuceneIndexDefinition;
@@ -89,7 +89,7 @@ public class LuceneInitializerHelper implements RepositoryInitializer {
* @return
*/
public LuceneInitializerHelper async(@NotNull final String async) {
- this.async = checkNotNull(async);
+ this.async = requireNonNull(async);
return this;
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
index b2f30a6dc8..47b67e0184 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.writer;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.lucene.TermFactory.newPathTerm;
import static org.apache.jackrabbit.oak.plugins.index.lucene.writer.IndexWriterUtils.getIndexWriterConfig;
@@ -268,9 +268,9 @@ class DefaultIndexWriter implements LuceneIndexWriter {
private static void trackIndexSizeInfo(@NotNull IndexWriter writer,
@NotNull IndexDefinition definition,
@NotNull Directory directory) throws IOException {
- checkNotNull(writer);
- checkNotNull(definition);
- checkNotNull(directory);
+ requireNonNull(writer);
+ requireNonNull(definition);
+ requireNonNull(directory);
int docs = writer.numDocs();
int ram = writer.numRamDocs();
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
index 13dd5e3c4e..931c051bb5 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class DefaultIndexWriterFactory implements LuceneIndexWriterFactory {
private final MountInfoProvider mountInfoProvider;
@@ -39,9 +39,9 @@ public class DefaultIndexWriterFactory implements LuceneIndexWriterFactory {
public DefaultIndexWriterFactory(MountInfoProvider mountInfoProvider,
DirectoryFactory directoryFactory, LuceneIndexWriterConfig writerConfig) {
- this.mountInfoProvider = checkNotNull(mountInfoProvider);
- this.directoryFactory = checkNotNull(directoryFactory);
- this.writerConfig = checkNotNull(writerConfig);
+ this.mountInfoProvider = requireNonNull(mountInfoProvider);
+ this.directoryFactory = requireNonNull(directoryFactory);
+ this.writerConfig = requireNonNull(writerConfig);
}
@Override
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
index 9995b7f3b5..49c1a74948 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static javax.jcr.PropertyType.TYPENAME_STRING;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
@@ -1950,8 +1950,8 @@ public class IndexPlannerTest {
@NotNull
private static NodeBuilder getNode(@NotNull NodeBuilder node, @NotNull String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
- node = node.getChildNode(checkNotNull(name));
+ for (String name : PathUtils.elements(requireNonNull(path))) {
+ node = node.getChildNode(requireNonNull(name));
}
return node;
}
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
index 64c73ef79b..653e45d810 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -155,7 +155,7 @@ public class TestUtil {
}
public static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
index 1c1cff0153..cffb3f8f19 100644
--- a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
+++ b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.osgi;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.lang.management.ManagementFactory;
import java.lang.reflect.InvocationHandler;
@@ -308,7 +308,7 @@ public class OakOSGiRepositoryFactory implements RepositoryFactory {
@SuppressWarnings("unchecked")
private static void processConfig(Map config) {
String home = (String) config.get(REPOSITORY_HOME);
- checkNotNull(home, "Repository home not defined via [%s]", REPOSITORY_HOME);
+ requireNonNull(home, String.format("Repository home not defined via [%s]", REPOSITORY_HOME));
home = FilenameUtils.normalizeNoEndSeparator(home);
@@ -481,7 +481,7 @@ public class OakOSGiRepositoryFactory implements RepositoryFactory {
return tracker.getRegistry();
}
- checkNotNull(obj, "Repository service is not available");
+ requireNonNull(obj, "Repository service is not available");
return method.invoke(obj, args);
}
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
index 494d72144f..265d20eda1 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
@@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.fixture.DataStoreUtils.cleanup;
import static org.apache.jackrabbit.oak.fixture.DataStoreUtils.configureIfCloudDataStore;
@@ -188,7 +188,7 @@ public abstract class BlobStoreFixture implements Closeable{
@Override
public BlobStore setUp() {
String className = System.getProperty("dataStore");
- checkNotNull(className, "No system property named 'dataStore' defined");
+ requireNonNull(className, "No system property named 'dataStore' defined");
try {
dataStore = Class.forName(className).asSubclass(DataStore.class).newInstance();
config = getConfig();
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
index 5d44338cce..b82b7fdbea 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
@@ -55,7 +55,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class IndexHelper implements Closeable {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -79,8 +79,8 @@ public class IndexHelper implements Closeable {
this.store = store;
this.blobStore = blobStore;
this.whiteboard = whiteboard;
- this.statisticsProvider = checkNotNull(WhiteboardUtils.getService(whiteboard, StatisticsProvider.class));
- this.indexReporter = checkNotNull(WhiteboardUtils.getService(whiteboard, IndexingReporter.class));
+ this.statisticsProvider = requireNonNull(WhiteboardUtils.getService(whiteboard, StatisticsProvider.class));
+ this.indexReporter = requireNonNull(WhiteboardUtils.getService(whiteboard, IndexingReporter.class));
this.outputDir = outputDir;
this.workDir = workDir;
this.indexPaths = List.copyOf(indexPaths);
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
index e980f15ca0..18173621f0 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
@@ -50,7 +50,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
public class IndexerSupport {
@@ -120,7 +120,7 @@ public class IndexerSupport {
log.warn("Using head state for indexing. Such an index cannot be imported back");
} else {
checkpointedState = indexHelper.getNodeStore().retrieve(checkpoint);
- checkNotNull(checkpointedState, "Not able to retrieve revision referred via checkpoint [%s]", checkpoint);
+ requireNonNull(checkpointedState, String.format("Not able to retrieve revision referred via checkpoint [%s]", checkpoint));
checkpointInfo = indexHelper.getNodeStore().checkpointInfo(checkpoint);
}
return checkpointedState;
@@ -185,7 +185,7 @@ public class IndexerSupport {
}
public static NodeBuilder childBuilder(NodeBuilder nb, String path, boolean createNew) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = createNew ? nb.child(name) : nb.getChildNode(name);
}
return nb;
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java
index 1dc89ef4f3..31bcb56779 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java
@@ -39,7 +39,7 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public abstract class OutOfBandIndexerBase implements Closeable, IndexUpdateCallback, NodeTraversalCallback{
@@ -62,8 +62,8 @@ public abstract class OutOfBandIndexerBase implements Closeable, IndexUpdateCall
//present in target repository
public OutOfBandIndexerBase(IndexHelper indexHelper, IndexerSupport indexerSupport) {
- this.indexHelper = checkNotNull(indexHelper);
- this.indexerSupport = checkNotNull(indexerSupport);
+ this.indexHelper = requireNonNull(indexHelper);
+ this.indexerSupport = requireNonNull(indexerSupport);
}
public void reindex() throws CommitFailedException, IOException {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/PrinterDumper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/PrinterDumper.java
index cb13c704b7..65340b52cd 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/PrinterDumper.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/PrinterDumper.java
@@ -30,7 +30,7 @@ import org.apache.commons.io.output.TeeOutputStream;
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
class PrinterDumper {
private final File outDir;
@@ -58,7 +58,7 @@ class PrinterDumper {
}
public File getOutFile() {
- return checkNotNull(outFile);
+ return requireNonNull(outFile);
}
private OutputStream newOutput() throws IOException {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
index 71513ddc2a..444c689fdb 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/CompositeIndexer.java
@@ -27,14 +27,14 @@ import java.util.Set;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class CompositeIndexer implements NodeStateIndexer {
private final List<NodeStateIndexer> indexers;
public CompositeIndexer(List<NodeStateIndexer> indexers) {
- this.indexers = checkNotNull(indexers);
+ this.indexers = requireNonNull(indexers);
}
public boolean isEmpty() {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
index a123200047..144069cbad 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
@@ -80,7 +80,7 @@ import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_SORTED_FILE_PATH;
import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDED_PATHS;
import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDE_ENTRIES_REGEX;
@@ -424,15 +424,15 @@ public abstract class DocumentStoreIndexerBase implements Closeable {
}
private MongoDocumentStore getMongoDocumentStore() {
- return checkNotNull(indexHelper.getService(MongoDocumentStore.class));
+ return requireNonNull(indexHelper.getService(MongoDocumentStore.class));
}
private MongoClientURI getMongoClientURI() {
- return checkNotNull(indexHelper.getService(MongoClientURI.class));
+ return requireNonNull(indexHelper.getService(MongoClientURI.class));
}
private MongoDatabase getMongoDatabase() {
- return checkNotNull(indexHelper.getService(MongoDatabase.class));
+ return requireNonNull(indexHelper.getService(MongoDatabase.class));
}
private void configureEstimators(IndexingProgressReporter progressReporter) {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/linkedList/FlatFileBufferLinkedList.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/linkedList/FlatFileBufferLinkedList.java
index c0effab823..098dadd653 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/linkedList/FlatFileBufferLinkedList.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/linkedList/FlatFileBufferLinkedList.java
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry;
import org.jetbrains.annotations.NotNull;
import java.util.Iterator;
+import java.util.Objects;
/**
* Linked list implementation which supports multiple iterators. The iterator's state
@@ -113,7 +114,7 @@ public class FlatFileBufferLinkedList implements NodeStateEntryList {
}
ListNode(@NotNull NodeStateEntry data) {
- Preconditions.checkNotNull(data);
+ Objects.requireNonNull(data);
this.data = data;
this.next = null;
}
@@ -123,12 +124,12 @@ public class FlatFileBufferLinkedList implements NodeStateEntryList {
private ListNode current;
static NodeIterator iteratorFor(@NotNull ListNode node) {
- Preconditions.checkNotNull(node);
+ Objects.requireNonNull(node);
return new NodeIterator(node);
}
NodeIterator(@NotNull ListNode start) {
- Preconditions.checkNotNull(start);
+ Objects.requireNonNull(start);
this.current = start;
}
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldVersionUtils.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldVersionUtils.java
index 8c08ad9f87..1dd38c35d6 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldVersionUtils.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldVersionUtils.java
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.util.ISO8601;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
public class PurgeOldVersionUtils {
@@ -49,8 +49,8 @@ public class PurgeOldVersionUtils {
*/
public static NodeBuilder getNode(@NotNull NodeBuilder nodeBuilder, @NotNull String path) {
NodeBuilder resultNodeBuilder = nodeBuilder;
- for (String name : PathUtils.elements(checkNotNull(path))) {
- resultNodeBuilder = resultNodeBuilder.getChildNode(checkNotNull(name));
+ for (String name : PathUtils.elements(requireNonNull(path))) {
+ resultNodeBuilder = resultNodeBuilder.getChildNode(requireNonNull(name));
}
return resultNodeBuilder;
}
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
index 7867b2c898..25bff0a2a1 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder.newMongoDocumentNodeStoreBuilder;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder.newRDBDocumentNodeStoreBuilder;
@@ -62,7 +62,7 @@ class DocumentFixtureProvider {
throw new IllegalStateException("Unknown DocumentStore");
}
- StatisticsProvider statisticsProvider = checkNotNull(getService(wb, StatisticsProvider.class));
+ StatisticsProvider statisticsProvider = requireNonNull(getService(wb, StatisticsProvider.class));
DocumentBuilderCustomizer customizer = getService(wb, DocumentBuilderCustomizer.class);
if (customizer != null) {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
index 962f3869ba..611c336964 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.util.EnumSet;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Arrays.asList;
public class Options {
@@ -90,8 +90,7 @@ public class Options {
@SuppressWarnings("unchecked")
public <T extends OptionsBean> T getOptionBean(Class<T> clazz){
Object o = optionBeans.get(clazz);
- checkNotNull(o, "No [%s] found in [%s]",
- clazz.getSimpleName(), optionBeans);
+ requireNonNull(o, String.format("No [%s] found in [%s]", clazz.getSimpleName(), optionBeans));
return (T) o;
}
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java
index 6cbb4ac1f0..2a6d28eb32 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java
@@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getService;
@@ -40,7 +40,7 @@ class SegmentFixtureProvider {
static NodeStore create(Options options, BlobStore blobStore, Whiteboard wb, Closer closer, boolean readOnly)
throws IOException, InvalidFileStoreVersionException {
- StatisticsProvider statisticsProvider = checkNotNull(getService(wb, StatisticsProvider.class));
+ StatisticsProvider statisticsProvider = requireNonNull(getService(wb, StatisticsProvider.class));
String path = options.getOptionBean(CommonOptions.class).getStoreArg();
FileStore.Builder builder = FileStore.builder(new File(path))
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
index 38746a6ee5..92097c1cb8 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.run.cli;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getService;
@@ -46,7 +46,7 @@ class SegmentTarFixtureProvider {
static NodeStore configureSegment(Options options, BlobStore blobStore, Whiteboard wb, Closer closer, boolean readOnly)
throws IOException, InvalidFileStoreVersionException {
- StatisticsProvider statisticsProvider = checkNotNull(getService(wb, StatisticsProvider.class));
+ StatisticsProvider statisticsProvider = requireNonNull(getService(wb, StatisticsProvider.class));
String pathOrUri = options.getOptionBean(CommonOptions.class).getStoreArg();
ToolUtils.SegmentStoreType segmentStoreType = ToolUtils.storeTypeFromPathOrUri(pathOrUri);
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/Modes.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/Modes.java
index ada533fca3..79312840a0 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/Modes.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/commons/Modes.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.run.commons;
import java.util.Map;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* represent an individual Mode for running a COMMAND. It's a substitution for the old Mode enum we
@@ -31,7 +31,7 @@ public final class Modes {
private final Map<String, Command> MODES;
public Modes(Map<String, Command> modes) {
- this.MODES = checkNotNull(modes, "Provided map of Modes cannot be null");
+ this.MODES = requireNonNull(modes, "Provided map of Modes cannot be null");
}
public Command getCommand(String name) {
diff --git a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java
index 7b1c277eb8..69e9b8fe7e 100644
--- a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java
+++ b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java
@@ -193,7 +193,7 @@ public class ElasticIndexCommand implements Command {
}
private void reindex(ElasticIndexOptions indexOpts, IndexHelper indexHelper, String checkpoint) throws IOException, CommitFailedException {
- Preconditions.checkNotNull(checkpoint, "Checkpoint value is required for reindexing done in read only mode");
+ Objects.requireNonNull(checkpoint, "Checkpoint value is required for reindexing done in read only mode");
Stopwatch w = Stopwatch.createStarted();
IndexerSupport indexerSupport = createIndexerSupport(indexHelper, checkpoint);
diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
index d4caa7f578..3f5f7ca360 100644
--- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
+++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
@@ -40,7 +40,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
import org.apache.jackrabbit.oak.spi.state.NodeBuilder as OakNodeBuilder
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull
+import static java.util.Objects.requireNonNull
class LuceneCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = 'lucene'
@@ -156,8 +156,8 @@ class LuceneCommand extends ComplexCommandSupport {
}
private static NodeBuilder getNode(NodeBuilder node, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
- node = node.getChildNode(checkNotNull(name));
+ for (String name : PathUtils.elements(requireNonNull(path))) {
+ node = node.getChildNode(requireNonNull(name));
}
return node;
}
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
index cde5b79356..9de9d3185c 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
/**
@@ -150,7 +150,7 @@ class CNDStreamWriter implements JsopWriter, Closeable {
if (arrayState == State.BEGIN || arrayState == State.STARTED) {
return;
}
- checkNotNull(deferredName);
+ requireNonNull(deferredName);
w.println();
space();
w.print('-');
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
index 515930d532..6a4f62f685 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java
@@ -56,7 +56,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_SORTED_FILE_PATH;
@@ -241,7 +241,7 @@ public class IndexCommand implements Command {
}
private File reindex(IndexOptions idxOpts, ExtendedIndexHelper extendedIndexHelper, String checkpoint) throws IOException, CommitFailedException {
- checkNotNull(checkpoint, "Checkpoint value is required for reindexing done in read only mode");
+ requireNonNull(checkpoint, "Checkpoint value is required for reindexing done in read only mode");
Stopwatch reindexWatch = Stopwatch.createStarted();
IndexerSupport indexerSupport = createIndexerSupport(extendedIndexHelper, checkpoint);
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
index 3a508759de..bf55278f83 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexer.java
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.FSDirectoryFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.Arrays.asList;
public class OutOfBandIndexer extends OutOfBandIndexerBase {
@@ -38,7 +38,7 @@ public class OutOfBandIndexer extends OutOfBandIndexerBase {
public OutOfBandIndexer(ExtendedIndexHelper extendedIndexHelper, IndexerSupport indexerSupport) {
super(extendedIndexHelper,indexerSupport);
- this.extendedIndexHelper = checkNotNull(extendedIndexHelper);
+ this.extendedIndexHelper = requireNonNull(extendedIndexHelper);
}
protected IndexEditorProvider createIndexEditorProvider() throws IOException {
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java
index bd4496fb0e..522b6e7ed0 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/SegmentPropertyIndexEditorProvider.java
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
/**
@@ -134,7 +134,7 @@ public class SegmentPropertyIndexEditorProvider implements IndexEditorProvider,
}
private static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java
index 55bd4ae453..ba63795630 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryResource.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.tika;
import org.apache.jackrabbit.guava.common.io.ByteSource;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.jetbrains.annotations.Nullable;
@@ -37,11 +37,11 @@ class BinaryResource {
@Nullable String encoding,
String path,
String blobId) {
- this.byteSource = checkNotNull(byteSource, "ByteSource must be provided");
+ this.byteSource = requireNonNull(byteSource, "ByteSource must be provided");
this.mimeType = mimeType;
this.encoding = encoding;
- this.path = checkNotNull(path, "Path must be provided");
- this.blobId = checkNotNull(blobId, "BlobId must be specified");
+ this.path = requireNonNull(path, "Path must be provided");
+ this.blobId = requireNonNull(blobId, "BlobId must be specified");
}
public ByteSource getByteSource() {
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
index 3bb7776714..113b6f49b7 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.plugins.tika;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.File;
@@ -92,13 +92,13 @@ public class TextExtractorMain {
}
}
- checkNotNull(dataFile, "Data file not configured with %s", tikaOpts.getDataFileSpecOpt());
+ requireNonNull(dataFile, String.format("Data file not configured with %s", tikaOpts.getDataFileSpecOpt()));
if (report || extract) {
//For report and extract case we do not need NodeStore access so create BlobStore directly
BlobStoreFixture blobStoreFixture = BlobStoreFixtureProvider.create(opts);
closer.register(blobStoreFixture);
- blobStore = checkNotNull(blobStoreFixture).getBlobStore();
+ blobStore = requireNonNull(blobStoreFixture).getBlobStore();
} else if (generate) {
NodeStoreFixture nodeStoreFixture = NodeStoreFixtureProvider.create(opts);
closer.register(nodeStoreFixture);
@@ -107,14 +107,14 @@ public class TextExtractorMain {
}
if (!populate) {
- checkNotNull(blobStore, "This command requires an external BlobStore configured");
+ requireNonNull(blobStore, "This command requires an external BlobStore configured");
}
// NOTE: The order of executing generate, populate and extract is correct in case the user
// calls the tool with multiple actions in same run.
if (generate){
- checkNotNull(dataFile, "Data file path not provided");
+ requireNonNull(dataFile, "Data file path not provided");
log.info("Generated csv data to be stored in {}", dataFile.getAbsolutePath());
BinaryResourceProvider brp = new NodeStoreBinaryResourceProvider(nodeStore, blobStore);
CSVFileGenerator generator = new CSVFileGenerator(dataFile);
@@ -124,10 +124,10 @@ public class TextExtractorMain {
if (populate) {
checkArgument(dataFile.exists(),
"Data file %s does not exist", dataFile.getAbsolutePath());
- checkNotNull(indexDir, "Lucene index directory " +
- "must be specified via %s", tikaOpts.getIndexDirSpecOpt());
- checkNotNull(storeDir, "Directory to store extracted text content " +
- "must be specified via %s", tikaOpts.getStoreDirSpecOpt());
+ requireNonNull(indexDir, String.format("Lucene index directory " +
+ "must be specified via %s", tikaOpts.getIndexDirSpecOpt()));
+ requireNonNull(storeDir, String.format("Directory to store extracted text content " +
+ "must be specified via %s", tikaOpts.getStoreDirSpecOpt()));
DataStoreTextWriter writer = closer.register(new DataStoreTextWriter(storeDir, false));
@@ -149,9 +149,9 @@ public class TextExtractorMain {
}
if (extract) {
- checkNotNull(storeDir, "Directory to store extracted text content " +
- "must be specified via %s", tikaOpts.getStoreDirSpecOpt());
- checkNotNull(blobStore, "BlobStore found to be null.");
+ requireNonNull(storeDir, String.format("Directory to store extracted text content " +
+ "must be specified via %s", tikaOpts.getStoreDirSpecOpt()));
+ requireNonNull(blobStore, "BlobStore found to be null.");
DataStoreTextWriter writer = new DataStoreTextWriter(storeDir, false);
TextExtractor extractor = new TextExtractor(writer);
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
index 84620ba898..24137e1d4a 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
@@ -87,7 +87,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Charsets.UTF_8;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.FILE_SEPARATOR;
import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -291,7 +291,7 @@ public class DataStoreCommand implements Command {
private static List<String> getMetadata(NodeStoreFixture fixture) {
String repositoryId = ClusterRepositoryInfo.getId(fixture.getStore());
- checkNotNull(repositoryId);
+ requireNonNull(repositoryId);
SharedDataStore dataStore = (SharedDataStore) fixture.getBlobStore();
// Get all the start markers available
@@ -357,7 +357,7 @@ public class DataStoreCommand implements Command {
closer.register(new ExecutorCloser(service));
String repositoryId = ClusterRepositoryInfo.getId(fixture.getStore());
- checkNotNull(repositoryId);
+ requireNonNull(repositoryId);
MarkSweepGarbageCollector collector =
new MarkSweepGarbageCollector(retriever, (GarbageCollectableBlobStore) fixture.getBlobStore(), service,
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/CompositePropertyUpdateCallback.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/CompositePropertyUpdateCallback.java
index 510e39068f..a98a533b19 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/CompositePropertyUpdateCallback.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/CompositePropertyUpdateCallback.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Composite {@link PropertyUpdateCallback}
@@ -36,7 +36,7 @@ public class CompositePropertyUpdateCallback implements PropertyUpdateCallback{
public CompositePropertyUpdateCallback(@NotNull Collection<PropertyUpdateCallback> callbacks) {
this.callbacks = callbacks;
- checkNotNull(callbacks);
+ requireNonNull(callbacks);
}
@Override
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
index 45ad59e231..58a38629fb 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
@@ -70,7 +70,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
@@ -340,17 +340,17 @@ public class IndexDefinition implements Aggregate.AggregateMapper {
protected IndexFormatVersion version;
public Builder root(NodeState root) {
- this.root = checkNotNull(root);
+ this.root = requireNonNull(root);
return this;
}
public Builder defn(NodeState defn) {
- this.defn = checkNotNull(defn);
+ this.defn = requireNonNull(defn);
return this;
}
public Builder indexPath(String indexPath) {
- this.indexPath = checkNotNull(indexPath);
+ this.indexPath = requireNonNull(indexPath);
return this;
}
@@ -401,10 +401,10 @@ public class IndexDefinition implements Aggregate.AggregateMapper {
protected IndexDefinition(NodeState root, NodeState defn, IndexFormatVersion version, String uid, String indexPath) {
try {
this.root = root;
- this.version = checkNotNull(version);
+ this.version = requireNonNull(version);
this.uid = uid;
this.definition = defn;
- this.indexPath = checkNotNull(indexPath);
+ this.indexPath = requireNonNull(indexPath);
this.indexName = indexPath;
this.indexTags = getOptionalValues(defn, IndexConstants.INDEX_TAGS, Type.STRINGS, String.class);
this.indexSelectionPolicy
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
index 864ace265e..506cc22189 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
import static org.apache.jackrabbit.oak.plugins.index.search.util.ConfigUtil.getPrimaryTypeName;
@@ -89,9 +89,9 @@ public abstract class FulltextDocumentMaker<D> implements DocumentMaker<D> {
IndexDefinition.IndexingRule indexingRule,
@NotNull String path) {
this.textExtractor = textExtractor;
- this.definition = checkNotNull(definition);
- this.indexingRule = checkNotNull(indexingRule);
- this.path = checkNotNull(path);
+ this.definition = requireNonNull(definition);
+ this.indexingRule = requireNonNull(indexingRule);
+ this.path = requireNonNull(path);
this.logWarnStringSizeThreshold = Integer.getInteger(WARN_LOG_STRING_SIZE_THRESHOLD_KEY,
DEFAULT_WARN_LOG_STRING_SIZE_THRESHOLD_VALUE);
}
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
index 81b9ff7891..bcc97eb6e5 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_RANDOM_SEED;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_REFRESH_DEFN;
import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.INDEX_DEFINITION_NODE;
@@ -100,7 +100,7 @@ public abstract class FulltextIndexEditorContext<D> {
ExtractedTextCache extractedTextCache,
IndexingContext indexingContext, boolean asyncIndexing) {
this.root = root;
- this.indexingContext = checkNotNull(indexingContext);
+ this.indexingContext = requireNonNull(indexingContext);
this.definitionBuilder = definition;
this.indexWriterFactory = indexWriterFactory;
this.definition = indexDefinition != null ? indexDefinition :
@@ -188,7 +188,7 @@ public abstract class FulltextIndexEditorContext<D> {
/** Only set for testing */
protected static void setClock(Clock c) {
- checkNotNull(c);
+ requireNonNull(c);
clock = c;
}
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
index 8e28427d53..50064e8476 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.in;
import static org.apache.jackrabbit.guava.common.base.Predicates.not;
import static org.apache.jackrabbit.guava.common.base.Predicates.notNull;
@@ -214,7 +214,7 @@ public abstract class FulltextIndexTracker<I extends IndexNodeManager<N>, N exte
I index = indices.get(path);
if (index != null) {
N indexNode = index.acquire();
- return checkNotNull(indexNode);
+ return requireNonNull(indexNode);
}
if (badIndexTracker.isIgnoredBadIndex(path)){
@@ -231,7 +231,7 @@ public abstract class FulltextIndexTracker<I extends IndexNodeManager<N>, N exte
index = openIndex(path, root, node);
if (index != null) {
N indexNode = index.acquire();
- checkNotNull(indexNode);
+ requireNonNull(indexNode);
indices = ImmutableMap.<String, I>builder()
.putAll(indices)
.put(path, index)
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexDefinitionBuilder.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexDefinitionBuilder.java
index 9eb6919a51..6b413c67b0 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexDefinitionBuilder.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexDefinitionBuilder.java
@@ -42,7 +42,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -149,17 +149,17 @@ public class IndexDefinitionBuilder {
}
public IndexDefinitionBuilder selectionPolicy(String policy) {
- tree.setProperty(INDEX_SELECTION_POLICY, checkNotNull(policy));
+ tree.setProperty(INDEX_SELECTION_POLICY, requireNonNull(policy));
return this;
}
public IndexDefinitionBuilder codec(String codecName){
- tree.setProperty(FulltextIndexConstants.CODEC_NAME, checkNotNull(codecName));
+ tree.setProperty(FulltextIndexConstants.CODEC_NAME, requireNonNull(codecName));
return this;
}
public IndexDefinitionBuilder mergePolicy(String mergePolicy) {
- tree.setProperty(FulltextIndexConstants.MERGE_POLICY_NAME, checkNotNull(mergePolicy));
+ tree.setProperty(FulltextIndexConstants.MERGE_POLICY_NAME, requireNonNull(mergePolicy));
return this;
}
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/NodeStateCopyUtils.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/NodeStateCopyUtils.java
index 1e73642a07..784a7f6d97 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/NodeStateCopyUtils.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/NodeStateCopyUtils.java
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
/**
@@ -153,6 +153,6 @@ public class NodeStateCopyUtils {
}
private static String primaryType(NodeState state){
- return checkNotNull(state.getName(JcrConstants.JCR_PRIMARYTYPE), "jcr:primaryType not defined for %s", state);
+ return requireNonNull(state.getName(JcrConstants.JCR_PRIMARYTYPE), String.format("jcr:primaryType not defined for %s", state));
}
}
diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPlannerCommonTest.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPlannerCommonTest.java
index d0a0b9c266..cea7223849 100644
--- a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPlannerCommonTest.java
+++ b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPlannerCommonTest.java
@@ -56,7 +56,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static javax.jcr.PropertyType.TYPENAME_STRING;
import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
@@ -1504,8 +1504,8 @@ public abstract class IndexPlannerCommonTest {
@NotNull
private static NodeBuilder getNode(@NotNull NodeBuilder node, @NotNull String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
- node = node.getChildNode(checkNotNull(name));
+ for (String name : PathUtils.elements(requireNonNull(path))) {
+ node = node.getChildNode(requireNonNull(name));
}
return node;
}
diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java
index 7055a7dfe1..737b6e4ec4 100644
--- a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java
+++ b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtil.java
@@ -54,7 +54,7 @@ import javax.jcr.Repository;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -133,7 +133,7 @@ public class TestUtil {
}
public static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
index 2ddb797eb3..be9c73f1ac 100644
--- a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
+++ b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
@@ -57,7 +57,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -149,7 +149,7 @@ public class TestUtil {
}
public static NodeBuilder child(NodeBuilder nb, String path) {
- for (String name : PathUtils.elements(checkNotNull(path))) {
+ for (String name : PathUtils.elements(requireNonNull(path))) {
nb = nb.child(name);
}
return nb;
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
index 7a8d03ff0d..35fe2d62bc 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
@@ -22,7 +22,7 @@ import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.Type;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Default implementation of the {@link RestrictionDefinition} interface.
@@ -43,7 +43,7 @@ public class RestrictionDefinitionImpl implements RestrictionDefinition {
* @param isMandatory A boolean indicating if the restriction is mandatory.
*/
public RestrictionDefinitionImpl(@NotNull String name, Type<?> type, boolean isMandatory) {
- this.name = checkNotNull(name);
+ this.name = requireNonNull(name);
if (type.tag() == PropertyType.UNDEFINED) {
throw new IllegalArgumentException("'undefined' is not a valid required definition type.");
}
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
index c7dd55e415..d5098af6b1 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
@@ -29,7 +29,7 @@ import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
import org.jetbrains.annotations.NotNull;
@@ -44,7 +44,7 @@ public class CompositePrincipalProvider implements PrincipalProvider {
private final List<PrincipalProvider> providers;
public CompositePrincipalProvider(List<PrincipalProvider> providers) {
- this.providers = checkNotNull(providers);
+ this.providers = requireNonNull(providers);
}
public static PrincipalProvider of(@NotNull List<PrincipalProvider> providers) {
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImpl.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImpl.java
index ddff33cfb3..82c783810b 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImpl.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImpl.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.spi.security.principal;
import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Default implementation of the {@code JackrabbitPrincipal} interface.
@@ -28,7 +28,7 @@ public class PrincipalImpl implements JackrabbitPrincipal {
private final String name;
public PrincipalImpl(String name) {
- this.name = checkNotNull(name);
+ this.name = requireNonNull(name);
}
//----------------------------------------------------------< Principal >---
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
index e12a0b92a4..bf609acf45 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Utility to generate and compare password hashes.
@@ -94,7 +94,7 @@ public final class PasswordUtil {
public static String buildPasswordHash(@NotNull String password,
@Nullable String algorithm,
int saltSize, int iterations) throws NoSuchAlgorithmException, UnsupportedEncodingException {
- checkNotNull(password);
+ requireNonNull(password);
if (iterations < NO_ITERATIONS) {
iterations = DEFAULT_ITERATIONS;
}
@@ -118,7 +118,7 @@ public final class PasswordUtil {
*/
public static String buildPasswordHash(@NotNull String password,
@NotNull ConfigurationParameters config) throws NoSuchAlgorithmException, UnsupportedEncodingException {
- checkNotNull(config);
+ requireNonNull(config);
String algorithm = config.getConfigValue(UserConstants.PARAM_PASSWORD_HASH_ALGORITHM, DEFAULT_ALGORITHM);
int iterations = config.getConfigValue(UserConstants.PARAM_PASSWORD_HASH_ITERATIONS, DEFAULT_ITERATIONS);
int saltSize = config.getConfigValue(UserConstants.PARAM_PASSWORD_SALT_SIZE, DEFAULT_SALT_SIZE);
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
index 3f52cb776f..1d3142e036 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.api.Type.STRING;
/**
@@ -120,7 +120,7 @@ public final class UserUtil implements UserConstants {
@Nullable
public static String getAuthorizableId(@NotNull Tree authorizableTree) {
- checkNotNull(authorizableTree);
+ requireNonNull(authorizableTree);
if (UserUtil.isType(authorizableTree, AuthorizableType.AUTHORIZABLE)) {
PropertyState idProp = authorizableTree.getProperty(UserConstants.REP_AUTHORIZABLE_ID);
if (idProp != null) {
diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java
index 6405dcebd1..c0e6b57abe 100644
--- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java
+++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.aws.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.SegmentCache.DEFAULT_SEGMENT_CACHE_MB;
import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.newFileStore;
import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.newSegmentNodeStorePersistence;
@@ -91,7 +91,7 @@ public class AwsCompact {
* @return this builder.
*/
public Builder withPath(String path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -173,7 +173,7 @@ public class AwsCompact {
* @return an instance of {@link Runnable}.
*/
public AwsCompact build() {
- checkNotNull(path);
+ requireNonNull(path);
return new AwsCompact(this);
}
}
diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java
index 95032b7719..7c7696f7d6 100644
--- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java
+++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment.aws.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.newSegmentNodeStorePersistence;
import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.printMessage;
import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.printableStopwatch;
@@ -80,7 +80,7 @@ public class AwsSegmentCopy {
* @return this builder.
*/
public Builder withSource(String source) {
- this.source = checkNotNull(source);
+ this.source = requireNonNull(source);
return this;
}
@@ -92,7 +92,7 @@ public class AwsSegmentCopy {
* @return this builder.
*/
public Builder withDestination(String destination) {
- this.destination = checkNotNull(destination);
+ this.destination = requireNonNull(destination);
return this;
}
@@ -103,7 +103,7 @@ public class AwsSegmentCopy {
* @return this builder.
*/
public Builder withSrcPersistencee(SegmentNodeStorePersistence srcPersistence) {
- this.srcPersistence = checkNotNull(srcPersistence);
+ this.srcPersistence = requireNonNull(srcPersistence);
return this;
}
@@ -114,7 +114,7 @@ public class AwsSegmentCopy {
* @return this builder.
*/
public Builder withDestPersistence(SegmentNodeStorePersistence destPersistence) {
- this.destPersistence = checkNotNull(destPersistence);
+ this.destPersistence = requireNonNull(destPersistence);
return this;
}
@@ -159,8 +159,8 @@ public class AwsSegmentCopy {
*/
public AwsSegmentCopy build() {
if (srcPersistence == null && destPersistence == null) {
- checkNotNull(source);
- checkNotNull(destination);
+ requireNonNull(source);
+ requireNonNull(destination);
}
return new AwsSegmentCopy(this);
}
diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java
index d4942f63f1..8f35f2a615 100644
--- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java
+++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.azure.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.createArchiveManager;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.createCloudBlobDirectory;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.newFileStore;
@@ -102,7 +102,7 @@ public class AzureCompact {
* @return this builder.
*/
public Builder withPath(String path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -114,7 +114,7 @@ public class AzureCompact {
* @return this builder
*/
public Builder withTargetPath(String targetPath) {
- this.targetPath = checkNotNull(targetPath);
+ this.targetPath = requireNonNull(targetPath);
return this;
}
@@ -201,7 +201,7 @@ public class AzureCompact {
* @return this builder
*/
public Builder withPersistentCachePath(String persistentCachePath) {
- this.persistentCachePath = checkNotNull(persistentCachePath);
+ this.persistentCachePath = requireNonNull(persistentCachePath);
return this;
}
@@ -213,7 +213,7 @@ public class AzureCompact {
* @return this builder
*/
public Builder withPersistentCacheSizeGb(Integer persistentCacheSizeGb) {
- this.persistentCacheSizeGb = checkNotNull(persistentCacheSizeGb);
+ this.persistentCacheSizeGb = requireNonNull(persistentCacheSizeGb);
return this;
}
@@ -223,7 +223,7 @@ public class AzureCompact {
* @return an instance of {@link Runnable}.
*/
public AzureCompact build() {
- checkNotNull(path);
+ requireNonNull(path);
return new AzureCompact(this);
}
}
diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java
index 44bb5e3ecd..baae1af4b3 100644
--- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java
+++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment.azure.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.newSegmentNodeStorePersistence;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.printMessage;
import static org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.printableStopwatch;
@@ -107,7 +107,7 @@ public class SegmentCopy {
* @return this builder.
*/
public Builder withSource(String source) {
- this.source = checkNotNull(source);
+ this.source = requireNonNull(source);
return this;
}
@@ -120,7 +120,7 @@ public class SegmentCopy {
* @return this builder.
*/
public Builder withDestination(String destination) {
- this.destination = checkNotNull(destination);
+ this.destination = requireNonNull(destination);
return this;
}
@@ -132,7 +132,7 @@ public class SegmentCopy {
* @return this builder.
*/
public Builder withSrcPersistencee(SegmentNodeStorePersistence srcPersistence) {
- this.srcPersistence = checkNotNull(srcPersistence);
+ this.srcPersistence = requireNonNull(srcPersistence);
return this;
}
@@ -144,7 +144,7 @@ public class SegmentCopy {
* @return this builder.
*/
public Builder withDestPersistence(SegmentNodeStorePersistence destPersistence) {
- this.destPersistence = checkNotNull(destPersistence);
+ this.destPersistence = requireNonNull(destPersistence);
return this;
}
@@ -226,8 +226,8 @@ public class SegmentCopy {
*/
public SegmentCopy build() {
if (srcPersistence == null && destPersistence == null) {
- checkNotNull(source);
- checkNotNull(destination);
+ requireNonNull(source);
+ requireNonNull(destination);
}
return new SegmentCopy(this);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java
index d36a0f9d6d..0e8d9ef67e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupRestoreImpl.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.backup.impl;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.System.nanoTime;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.formatTime;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.done;
@@ -80,11 +80,11 @@ public class FileStoreBackupRestoreImpl implements FileStoreBackupRestoreMBean {
@NotNull File file,
@NotNull Executor executor
) {
- this.store = checkNotNull(store);
- this.revisions = checkNotNull(revisions);
- this.reader = checkNotNull(reader);
- this.file = checkNotNull(file);
- this.executor = checkNotNull(executor);
+ this.store = requireNonNull(store);
+ this.revisions = requireNonNull(revisions);
+ this.reader = requireNonNull(reader);
+ this.file = requireNonNull(file);
+ this.executor = requireNonNull(executor);
this.fileStoreBackup = new FileStoreBackupImpl();
this.fileStoreRestore = new FileStoreRestoreImpl();
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
index 8d2685df5d..e135895fd5 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
/**
@@ -47,7 +47,7 @@ class BlockRecord extends Record {
*/
public int read(int position, byte[] buffer, int offset, int length) {
checkElementIndex(position, size);
- checkNotNull(buffer);
+ requireNonNull(buffer);
checkPositionIndexes(offset, offset + length, buffer.length);
if (position + length > size) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
index 9f6fa1d81a..3abdb79589 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.UnsupportedEncodingException;
@@ -82,7 +82,7 @@ public class CachingSegmentReader implements SegmentReader {
long templateCacheMB,
MeterStats readStats
) {
- this.writer = checkNotNull(writer);
+ this.writer = requireNonNull(writer);
this.blobStore = blobStore;
stringCache = new StringCache(stringCacheMB * 1024 * 1024);
templateCache = new TemplateCache(templateCacheMB * 1024 * 1024);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ClassicCompactor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ClassicCompactor.java
index 2d5a3ea53a..fa8f2217fa 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ClassicCompactor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ClassicCompactor.java
@@ -17,7 +17,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -77,8 +77,8 @@ public class ClassicCompactor extends Compactor {
public ClassicCompactor(
@NotNull CompactionWriter writer,
@NotNull GCNodeWriteMonitor compactionMonitor) {
- this.writer = checkNotNull(writer);
- this.compactionMonitor = checkNotNull(compactionMonitor);
+ this.writer = requireNonNull(writer);
+ this.compactionMonitor = requireNonNull(compactionMonitor);
}
@Override
@@ -145,16 +145,16 @@ public class ClassicCompactor extends Compactor {
private void updated() throws IOException {
if (++modCount % UPDATE_LIMIT == 0) {
SegmentNodeState newBase = writeNodeState(builder.getNodeState(), null, false);
- checkNotNull(newBase);
+ requireNonNull(newBase);
builder = new MemoryNodeBuilder(newBase);
}
}
CompactDiff(@NotNull NodeState base, @NotNull Canceller hardCanceller, @NotNull Canceller softCanceller) {
- this.base = checkNotNull(base);
+ this.base = requireNonNull(base);
this.builder = new MemoryNodeBuilder(base);
- this.hardCanceller = checkNotNull(hardCanceller);
- this.softCanceller = checkNotNull(softCanceller);
+ this.hardCanceller = requireNonNull(hardCanceller);
+ this.softCanceller = requireNonNull(softCanceller);
}
private @NotNull CancelableDiff newCancelableDiff() {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
index edef45810b..571733a99c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Charsets.UTF_8;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndex;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
@@ -140,12 +140,12 @@ public class DefaultSegmentWriter implements SegmentWriter {
@NotNull WriteOperationHandler writeOperationHandler,
int binariesInlineThreshold
) {
- this.store = checkNotNull(store);
- this.reader = checkNotNull(reader);
- this.idProvider = checkNotNull(idProvider);
+ this.store = requireNonNull(store);
+ this.reader = requireNonNull(reader);
+ this.idProvider = requireNonNull(idProvider);
this.blobStore = blobStore;
- this.cacheManager = checkNotNull(cacheManager);
- this.writeOperationHandler = checkNotNull(writeOperationHandler);
+ this.cacheManager = requireNonNull(cacheManager);
+ this.writeOperationHandler = requireNonNull(writeOperationHandler);
checkArgument(binariesInlineThreshold >= 0);
checkArgument(binariesInlineThreshold <= Segment.MEDIUM_LIMIT);
this.binariesInlineThreshold = binariesInlineThreshold;
@@ -333,7 +333,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
}
private RecordId writeMapLeaf(int level, Collection<MapEntry> entries) throws IOException {
- checkNotNull(entries);
+ requireNonNull(entries);
int size = entries.size();
checkElementIndex(size, MapRecord.MAX_SIZE);
checkPositionIndex(level, MapRecord.MAX_NUMBER_OF_LEVELS);
@@ -453,7 +453,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
* @return list record identifier
*/
private RecordId writeList(@NotNull List<RecordId> list) throws IOException {
- checkNotNull(list);
+ requireNonNull(list);
checkArgument(!list.isEmpty());
List<RecordId> thisLevel = list;
while (thisLevel.size() > 1) {
@@ -621,7 +621,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
private RecordId writeBlock(@NotNull byte[] bytes, int offset, int length)
throws IOException {
- checkNotNull(bytes);
+ requireNonNull(bytes);
checkPositionIndexes(offset, offset + length, bytes.length);
return writeOperationHandler.execute(gcGeneration, newWriteOperation(
RecordWriters.newBlockWriter(bytes, offset, length)));
@@ -747,7 +747,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
}
private RecordId writeTemplate(Template template) throws IOException {
- checkNotNull(template);
+ requireNonNull(template);
RecordId id = templateCache.get(template);
if (id != null) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
index b5d7e22b9e..0fe021dfae 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.SegmentBufferWriterPool.PoolType;
import org.apache.jackrabbit.guava.common.base.Supplier;
@@ -64,7 +64,7 @@ public final class DefaultSegmentWriterBuilder {
private WriterCacheManager cacheManager = new WriterCacheManager.Default();
private DefaultSegmentWriterBuilder(@NotNull String name) {
- this.name = checkNotNull(name);
+ this.name = requireNonNull(name);
}
/**
@@ -89,7 +89,7 @@ public final class DefaultSegmentWriterBuilder {
*/
@NotNull
public DefaultSegmentWriterBuilder withGeneration(@NotNull Supplier<GCGeneration> generation) {
- this.generation = checkNotNull(generation);
+ this.generation = requireNonNull(generation);
return this;
}
@@ -99,7 +99,7 @@ public final class DefaultSegmentWriterBuilder {
*/
@NotNull
public DefaultSegmentWriterBuilder withGeneration(@NotNull GCGeneration generation) {
- this.generation = () -> checkNotNull(generation);
+ this.generation = () -> requireNonNull(generation);
return this;
}
@@ -133,7 +133,7 @@ public final class DefaultSegmentWriterBuilder {
*/
@NotNull
public DefaultSegmentWriterBuilder with(WriterCacheManager cacheManager) {
- this.cacheManager = checkNotNull(cacheManager);
+ this.cacheManager = requireNonNull(cacheManager);
return this;
}
@@ -153,7 +153,7 @@ public final class DefaultSegmentWriterBuilder {
@NotNull
public DefaultSegmentWriter build(@NotNull FileStore store) {
return new DefaultSegmentWriter(
- checkNotNull(store),
+ requireNonNull(store),
store.getReader(),
store.getSegmentIdProvider(),
store.getBlobStore(),
@@ -171,7 +171,7 @@ public final class DefaultSegmentWriterBuilder {
@NotNull
public DefaultSegmentWriter build(@NotNull ReadOnlyFileStore store) {
return new DefaultSegmentWriter(
- checkNotNull(store),
+ requireNonNull(store),
store.getReader(),
store.getSegmentIdProvider(),
store.getBlobStore(),
@@ -206,7 +206,7 @@ public final class DefaultSegmentWriterBuilder {
@NotNull
public DefaultSegmentWriter build(@NotNull MemoryStore store) {
return new DefaultSegmentWriter(
- checkNotNull(store),
+ requireNonNull(store),
store.getReader(),
store.getSegmentIdProvider(),
store.getBlobStore(),
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
index 034e5da459..9abdfcdc7a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.segment.MapRecord.HASH_MASK;
@@ -53,9 +53,9 @@ class MapEntry extends AbstractChildNodeEntry
@NotNull String name,
@NotNull RecordId key,
@Nullable RecordId value) {
- this.reader = checkNotNull(reader);
- this.name = checkNotNull(name);
- this.key = checkNotNull(key);
+ this.reader = requireNonNull(reader);
+ this.name = requireNonNull(name);
+ this.key = requireNonNull(key);
this.value = value;
}
@@ -72,7 +72,7 @@ class MapEntry extends AbstractChildNodeEntry
@NotNull String name,
@NotNull RecordId key,
@NotNull RecordId value) {
- return new MapEntry(reader, name, key, checkNotNull(value));
+ return new MapEntry(reader, name, key, requireNonNull(value));
}
/**
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
index 4d107611f8..d86f0cc607 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.lang.Integer.bitCount;
@@ -121,7 +121,7 @@ public class MapRecord extends Record {
MapRecord(@NotNull SegmentReader reader, @NotNull RecordId id) {
super(id);
- this.reader = checkNotNull(reader);
+ this.reader = requireNonNull(reader);
}
boolean isLeaf() {
@@ -177,7 +177,7 @@ public class MapRecord extends Record {
}
MapEntry getEntry(String name) {
- checkNotNull(name);
+ requireNonNull(name);
int hash = getHash(name);
Segment segment = getSegment();
@@ -256,7 +256,7 @@ public class MapRecord extends Record {
}
private RecordId getValue(int hash, RecordId key) {
- checkNotNull(key);
+ requireNonNull(key);
Segment segment = getSegment();
int head = segment.readInt(getRecordNumber());
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ParallelCompactor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ParallelCompactor.java
index 3830eb7584..e1385ef893 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ParallelCompactor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ParallelCompactor.java
@@ -45,7 +45,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -118,9 +118,9 @@ public class ParallelCompactor extends CheckpointCompactor {
private @Nullable Future<CompactedNodeState> compactionFuture;
CompactionTree(@NotNull NodeState before, @NotNull NodeState after, @NotNull NodeState onto) {
- this.before = checkNotNull(before);
- this.after = checkNotNull(after);
- this.onto = checkNotNull(onto);
+ this.before = requireNonNull(before);
+ this.after = requireNonNull(after);
+ this.onto = requireNonNull(onto);
}
private class Property {
@@ -202,7 +202,7 @@ public class ParallelCompactor extends CheckpointCompactor {
*/
void compactAsync(@NotNull Canceller hardCanceller, @Nullable Canceller softCanceller) {
if (compactionFuture == null) {
- checkNotNull(executorService);
+ requireNonNull(executorService);
if (softCanceller == null) {
compactionFuture = executorService.submit(() ->
compactor.compact(before, after, onto, hardCanceller));
@@ -309,7 +309,7 @@ public class ParallelCompactor extends CheckpointCompactor {
}
@Nullable CompactedNodeState diff(@NotNull NodeState before, @NotNull NodeState after) throws IOException {
- checkNotNull(executorService);
+ requireNonNull(executorService);
checkState(!executorService.isShutdown());
gcListener.info("compacting with {} threads.", numWorkers + 1);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java
index 73d360c1e2..73c958436d 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/PropertyTemplate.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -46,12 +46,12 @@ public class PropertyTemplate implements Comparable<PropertyTemplate> {
PropertyTemplate(int index, String name, Type<?> type) {
this.index = index;
- this.name = checkNotNull(name);
- this.type = checkNotNull(type);
+ this.name = requireNonNull(name);
+ this.type = requireNonNull(type);
}
PropertyTemplate(PropertyState state) {
- checkNotNull(state);
+ requireNonNull(state);
this.index = 0;
this.name = state.getName();
this.type = state.getType();
@@ -73,7 +73,7 @@ public class PropertyTemplate implements Comparable<PropertyTemplate> {
@Override
public int compareTo(@NotNull PropertyTemplate template) {
- checkNotNull(template);
+ requireNonNull(template);
return ComparisonChain.start()
.compare(hashCode(), template.hashCode()) // important
.compare(name, template.name)
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
index 0d4e489c1a..956edbec5b 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
import java.util.Arrays;
@@ -66,8 +66,8 @@ public abstract class ReaderCache<T> {
*/
protected ReaderCache(long maxWeight, int averageWeight,
@NotNull String name, @NotNull Weigher<CacheKey, T> weigher) {
- this.name = checkNotNull(name);
- this.weigher = checkNotNull(weigher);
+ this.name = requireNonNull(name);
+ this.weigher = requireNonNull(weigher);
fastCache = new FastCache<>();
cache = CacheLIRS.<CacheKey, T>newBuilder()
.module(name)
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
index 37393465af..bd2c6fa668 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.LongAdder;
@@ -87,7 +87,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
if (size <= 0) {
return Empty.emptyFactory();
} else {
- return Default.defaultFactory(size, checkNotNull(weigher));
+ return Default.defaultFactory(size, requireNonNull(weigher));
}
}
@@ -159,7 +159,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
}
static <K> Supplier<RecordCache<K>> defaultFactory(final int size, @NotNull final Weigher<K, RecordId> weigher) {
- return () -> new Default<>(size, checkNotNull(weigher));
+ return () -> new Default<>(size, requireNonNull(weigher));
}
Default(final int size, @NotNull final Weigher<K, RecordId> weigher) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
index ad75eff230..72f0e12504 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
@@ -47,9 +47,9 @@ public class RecordCacheStats extends AbstractCacheStats {
@NotNull Supplier<Long> elementCount,
@NotNull Supplier<Long> weight) {
super(name);
- this.stats = checkNotNull(stats);
- this.elementCount = checkNotNull(elementCount);
- this.weight = checkNotNull(weight);
+ this.stats = requireNonNull(stats);
+ this.elementCount = requireNonNull(elementCount);
+ this.weight = requireNonNull(weight);
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
index 09b330b3d6..af16bfdb97 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.Integer.parseInt;
import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
@@ -74,7 +74,7 @@ public final class RecordId implements Comparable<RecordId> {
private final int offset;
public RecordId(SegmentId segmentId, int offset) {
- this.segmentId = checkNotNull(segmentId);
+ this.segmentId = requireNonNull(segmentId);
this.offset = offset;
}
@@ -115,7 +115,7 @@ public final class RecordId implements Comparable<RecordId> {
@Override
public int compareTo(@NotNull RecordId that) {
- checkNotNull(that);
+ requireNonNull(that);
int diff = segmentId.compareTo(that.segmentId);
if (diff == 0) {
diff = offset - that.offset;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
index 830b4051d3..bf1a1b6655 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static java.util.Arrays.fill;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
@@ -175,9 +175,9 @@ public class Segment {
@NotNull SegmentReferences segmentReferences,
@NotNull String info
) {
- this.id = checkNotNull(id);
- this.reader = checkNotNull(reader);
- this.info = checkNotNull(info);
+ this.id = requireNonNull(id);
+ this.reader = requireNonNull(reader);
+ this.info = requireNonNull(info);
if (id.isDataSegmentId()) {
this.data = newSegmentData(Buffer.wrap(buffer));
} else {
@@ -193,10 +193,10 @@ public class Segment {
@NotNull SegmentReader reader,
@NotNull final SegmentId id,
@NotNull final Buffer data) {
- this.reader = checkNotNull(reader);
- this.id = checkNotNull(id);
+ this.reader = requireNonNull(reader);
+ this.id = requireNonNull(id);
if (id.isDataSegmentId()) {
- this.data = newSegmentData(checkNotNull(data).slice());
+ this.data = newSegmentData(requireNonNull(data).slice());
byte segmentVersion = this.data.getVersion();
checkState(this.data.getSignature().equals("0aK") && isValid(segmentVersion), new Object() {
@@ -210,7 +210,7 @@ public class Segment {
this.recordNumbers = readRecordNumberOffsets();
this.segmentReferences = readReferencedSegments(idProvider);
} else {
- this.data = newRawSegmentData(checkNotNull(data).slice());
+ this.data = newRawSegmentData(requireNonNull(data).slice());
this.version = LATEST_VERSION;
this.recordNumbers = new IdentityRecordNumbers();
this.segmentReferences = new IllegalSegmentReferences();
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
index 4c9eeb9f9b..be8c3274cb 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Charsets.UTF_8;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.lang.System.arraycopy;
@@ -145,13 +145,13 @@ public class SegmentBufferWriter implements WriteOperationHandler {
@NotNull SegmentReader reader,
@Nullable String wid,
@NotNull GCGeneration gcGeneration) {
- this.idProvider = checkNotNull(idProvider);
- this.reader = checkNotNull(reader);
+ this.idProvider = requireNonNull(idProvider);
+ this.reader = requireNonNull(reader);
this.wid = (wid == null
? "w-" + identityHashCode(this)
: wid);
- this.gcGeneration = checkNotNull(gcGeneration);
+ this.gcGeneration = requireNonNull(gcGeneration);
}
@NotNull
@@ -252,7 +252,7 @@ public class SegmentBufferWriter implements WriteOperationHandler {
* @param recordId the record ID.
*/
public void writeRecordId(RecordId recordId) {
- checkNotNull(recordId);
+ requireNonNull(recordId);
checkState(segmentReferences.size() + 1 < 0xffff,
"Segment cannot have more than 0xffff references");
@@ -389,7 +389,7 @@ public class SegmentBufferWriter implements WriteOperationHandler {
*/
public RecordId prepare(RecordType type, int size, Collection<RecordId> ids, SegmentStore store) throws IOException {
checkArgument(size >= 0);
- checkNotNull(ids);
+ requireNonNull(ids);
if (segment == null) {
// Create a segment first if this is the first time this segment buffer writer is used.
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
index 9e27a4a2f4..8b4f532cef 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
@@ -68,10 +68,10 @@ public abstract class SegmentBufferWriterPool implements WriteOperationHandler {
@NotNull SegmentReader reader,
@NotNull String wid,
@NotNull Supplier<GCGeneration> gcGeneration) {
- this.idProvider = checkNotNull(idProvider);
- this.reader = checkNotNull(reader);
- this.wid = checkNotNull(wid);
- this.gcGeneration = checkNotNull(gcGeneration);
+ this.idProvider = requireNonNull(idProvider);
+ this.reader = requireNonNull(reader);
+ this.wid = requireNonNull(wid);
+ this.gcGeneration = requireNonNull(gcGeneration);
}
public enum PoolType {
@@ -94,10 +94,10 @@ public abstract class SegmentBufferWriterPool implements WriteOperationHandler {
@NotNull SegmentReader reader,
@NotNull String wid,
@NotNull Supplier<GCGeneration> gcGeneration) {
- this.idProvider = checkNotNull(idProvider);
- this.reader = checkNotNull(reader);
- this.wid = checkNotNull(wid);
- this.gcGeneration = checkNotNull(gcGeneration);
+ this.idProvider = requireNonNull(idProvider);
+ this.reader = requireNonNull(reader);
+ this.wid = requireNonNull(wid);
+ this.gcGeneration = requireNonNull(gcGeneration);
}
@NotNull
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
index d47f6a2f5a..41238c04b4 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.CacheWeights.segmentWeight;
import java.util.concurrent.Callable;
@@ -292,7 +292,7 @@ public abstract class SegmentCache {
protected Stats(@NotNull String name, long maximumWeight, @NotNull Supplier<Long> elementCount) {
super(name);
this.maximumWeight = maximumWeight;
- this.elementCount = checkNotNull(elementCount);
+ this.elementCount = requireNonNull(elementCount);
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
index 88b8f19dbc..dd6a5512de 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.IOException;
import java.io.InputStream;
@@ -84,7 +84,7 @@ public class SegmentNodeBuilder extends MemoryNodeBuilder {
super(base);
this.blobStore = blobStore;
this.reader = reader;
- this.writer = checkNotNull(writer);
+ this.writer = requireNonNull(writer);
this.updateCount = 0;
this.readStats = readStats;
}
@@ -100,7 +100,7 @@ public class SegmentNodeBuilder extends MemoryNodeBuilder {
super(parent, name);
this.blobStore = blobStore;
this.reader = reader;
- this.writer = checkNotNull(writer);
+ this.writer = requireNonNull(writer);
this.updateCount = -1;
this.readStats = readStats;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
index dad20fa13a..9d69f49dab 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Suppliers.memoize;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Collections.emptyList;
@@ -85,8 +85,8 @@ public class SegmentNodeState extends Record implements NodeState {
MeterStats readStats
) {
super(id);
- this.reader = checkNotNull(reader);
- this.writer = checkNotNull(memoize(writer));
+ this.reader = requireNonNull(reader);
+ this.writer = requireNonNull(memoize(writer));
this.blobStore = blobStore;
this.readStats = readStats;
}
@@ -199,7 +199,7 @@ public class SegmentNodeState extends Record implements NodeState {
@Override
public boolean hasProperty(@NotNull String name) {
readStats.mark();
- checkNotNull(name);
+ requireNonNull(name);
Template template = getTemplate();
switch (name) {
case JCR_PRIMARYTYPE:
@@ -214,7 +214,7 @@ public class SegmentNodeState extends Record implements NodeState {
@Override @Nullable
public PropertyState getProperty(@NotNull String name) {
readStats.mark();
- checkNotNull(name);
+ requireNonNull(name);
Template template = getTemplate();
PropertyState property = null;
if (JCR_PRIMARYTYPE.equals(name)) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
index 6bdb211d1d..fe20541d8c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.api.Type.STRING;
@@ -111,7 +111,7 @@ public class SegmentNodeStore implements NodeStore, Observable {
*/
@NotNull
public SegmentNodeStoreBuilder withStatisticsProvider(@NotNull StatisticsProvider statisticsProvider) {
- this.statsProvider = checkNotNull(statisticsProvider);
+ this.statsProvider = requireNonNull(statisticsProvider);
return this;
}
@@ -153,8 +153,8 @@ public class SegmentNodeStore implements NodeStore, Observable {
@NotNull SegmentReader reader,
@NotNull SegmentWriter writer,
@Nullable BlobStore blobStore) {
- return new SegmentNodeStoreBuilder(checkNotNull(revisions),
- checkNotNull(reader), checkNotNull(writer), blobStore);
+ return new SegmentNodeStoreBuilder(requireNonNull(revisions),
+ requireNonNull(reader), requireNonNull(writer), blobStore);
}
static final String ROOT = "root";
@@ -279,7 +279,7 @@ public class SegmentNodeStore implements NodeStore, Observable {
@Override
public Map<String, String> checkpointInfo(@NotNull String checkpoint) {
Map<String, String> properties = newHashMap();
- checkNotNull(checkpoint);
+ requireNonNull(checkpoint);
NodeState cp = scheduler.getHeadNodeState()
.getChildNode("checkpoints")
.getChildNode(checkpoint)
@@ -300,7 +300,7 @@ public class SegmentNodeStore implements NodeStore, Observable {
@Override @Nullable
public NodeState retrieve(@NotNull String checkpoint) {
- checkNotNull(checkpoint);
+ requireNonNull(checkpoint);
NodeState cp = scheduler.getHeadNodeState()
.getChildNode("checkpoints")
.getChildNode(checkpoint)
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
index 084e6bb633..6bed979da9 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Charsets.UTF_8;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Collections.singletonList;
@@ -263,7 +263,7 @@ public class SegmentParser {
private final SegmentReader reader;
public SegmentParser(@NotNull SegmentReader reader) {
- this.reader = checkNotNull(reader);
+ this.reader = requireNonNull(reader);
}
/**
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
index b464635422..6616536281 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
@@ -73,9 +73,9 @@ public class SegmentPropertyState extends Record implements PropertyState {
SegmentPropertyState(@NotNull SegmentReader reader, @NotNull RecordId id,
@NotNull String name, @NotNull Type<?> type) {
super(id);
- this.reader = checkNotNull(reader);
- this.name = checkNotNull(name);
- this.type = checkNotNull(type);
+ this.reader = requireNonNull(reader);
+ this.name = requireNonNull(name);
+ this.type = requireNonNull(type);
}
SegmentPropertyState(@NotNull SegmentReader reader, @NotNull RecordId id,
@@ -174,7 +174,7 @@ public class SegmentPropertyState extends Record implements PropertyState {
@Override @NotNull
public <T> T getValue(Type<T> type, int index) {
- checkNotNull(type);
+ requireNonNull(type);
checkArgument(!type.isArray(), "Type must not be an array type");
Segment segment = getSegment();
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
index 59caf85565..cdee6e3bc7 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
@@ -67,15 +67,15 @@ public class SegmentStream extends InputStream {
private long mark = 0;
SegmentStream(RecordId recordId, ListRecord blocks, long length) {
- this.recordId = checkNotNull(recordId);
+ this.recordId = requireNonNull(recordId);
this.inline = null;
- this.blocks = checkNotNull(blocks);
+ this.blocks = requireNonNull(blocks);
checkArgument(length >= 0);
this.length = length;
}
SegmentStream(RecordId recordId, Buffer inline, int length) {
- this.recordId = checkNotNull(recordId);
+ this.recordId = requireNonNull(recordId);
this.inline = inline.duplicate();
this.blocks = null;
this.length = length;
@@ -139,7 +139,7 @@ public class SegmentStream extends InputStream {
@Override
public int read(@NotNull byte[] b, int off, int len) {
- checkNotNull(b);
+ requireNonNull(b);
checkPositionIndexes(off, off + len, b.length);
if (len == 0) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
index aed89f85d8..819eabb6ed 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import java.security.SecureRandom;
@@ -72,7 +72,7 @@ public class SegmentTracker implements SegmentIdProvider {
private final SegmentIdFactory segmentIdFactory;
public SegmentTracker(@NotNull SegmentIdFactory segmentIdFactory) {
- this.segmentIdFactory = checkNotNull(segmentIdFactory);
+ this.segmentIdFactory = requireNonNull(segmentIdFactory);
for (int i = 0; i < tables.length; i++) {
tables[i] = new SegmentIdTable();
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
index f8d4a981db..fa5ed75e80 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
@@ -96,7 +96,7 @@ public class Template {
@Nullable PropertyState mixinTypes,
@Nullable PropertyTemplate[] properties,
@Nullable String childName) {
- this.reader = checkNotNull(reader);
+ this.reader = requireNonNull(reader);
this.primaryType = primaryType;
this.mixinTypes = mixinTypes;
if (properties != null) {
@@ -109,8 +109,8 @@ public class Template {
}
Template(@NotNull SegmentReader reader, @NotNull NodeState state) {
- this.reader = checkNotNull(reader);
- checkNotNull(state);
+ this.reader = requireNonNull(reader);
+ requireNonNull(state);
PropertyState primary = null;
PropertyState mixins = null;
List<PropertyTemplate> templates = Lists.newArrayList();
@@ -191,7 +191,7 @@ public class Template {
SegmentPropertyState getProperty(RecordId recordId, int index) {
checkElementIndex(index, properties.length);
- Segment segment = checkNotNull(recordId).getSegment();
+ Segment segment = requireNonNull(recordId).getSegment();
int offset = 2 * RECORD_ID_BYTES;
if (childName != ZERO_CHILD_NODES) {
@@ -245,8 +245,8 @@ public class Template {
}
public boolean compare(RecordId thisId, RecordId thatId) {
- checkNotNull(thisId);
- checkNotNull(thatId);
+ requireNonNull(thisId);
+ requireNonNull(thatId);
// Compare properties
for (int i = 0; i < properties.length; i++) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
index 0db45bc6e5..29e9656142 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Suppliers.memoize;
import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
@@ -116,7 +116,7 @@ public abstract class WriterCacheManager {
public WriterCacheManager withAccessTracking(
@NotNull String name,
@NotNull StatisticsProvider statisticsProvider) {
- return new AccessTrackingCacheManager(checkNotNull(name), checkNotNull(statisticsProvider), this);
+ return new AccessTrackingCacheManager(requireNonNull(name), requireNonNull(statisticsProvider), this);
}
/**
@@ -267,7 +267,7 @@ public abstract class WriterCacheManager {
private final Supplier<T> cacheFactory;
Generations(@NotNull Supplier<T> cacheFactory) {
- this.cacheFactory = checkNotNull(cacheFactory);
+ this.cacheFactory = requireNonNull(cacheFactory);
}
T getGeneration(final int generation) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
index 8515fc8e7f..7ce64abdc8 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.compaction;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.RETAINED_GENERATIONS_DEFAULT;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
@@ -51,9 +51,9 @@ public class SegmentRevisionGCMBean
@NotNull SegmentGCOptions gcOptions,
@NotNull FileStoreGCMonitor fileStoreGCMonitor) {
super(SegmentRevisionGC.class);
- this.fileStore = checkNotNull(fileStore);
- this.gcOptions = checkNotNull(gcOptions);
- this.fileStoreGCMonitor = checkNotNull(fileStoreGCMonitor);
+ this.fileStore = requireNonNull(fileStore);
+ this.gcOptions = requireNonNull(gcOptions);
+ this.fileStoreGCMonitor = requireNonNull(fileStoreGCMonitor);
}
//------------------------------------------------------------< SegmentRevisionGC >---
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
index 9889a808fd..7aed06f288 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.segment.file;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.lang.Boolean.getBoolean;
@@ -159,7 +159,7 @@ public class FileStoreBuilder {
}
private FileStoreBuilder(@NotNull File directory) {
- this.directory = checkNotNull(directory);
+ this.directory = requireNonNull(directory);
this.gcListener.registerGCMonitor(new LoggingGCMonitor(LOG));
this.persistence = new TarPersistence(directory);
}
@@ -172,7 +172,7 @@ public class FileStoreBuilder {
*/
@NotNull
public FileStoreBuilder withBlobStore(@NotNull BlobStore blobStore) {
- this.blobStore = checkNotNull(blobStore);
+ this.blobStore = requireNonNull(blobStore);
return this;
}
@@ -303,7 +303,7 @@ public class FileStoreBuilder {
*/
@NotNull
public FileStoreBuilder withGCMonitor(@NotNull GCMonitor gcMonitor) {
- this.gcListener.registerGCMonitor(checkNotNull(gcMonitor));
+ this.gcListener.registerGCMonitor(requireNonNull(gcMonitor));
return this;
}
@@ -315,7 +315,7 @@ public class FileStoreBuilder {
*/
@NotNull
public FileStoreBuilder withStatisticsProvider(@NotNull StatisticsProvider statisticsProvider) {
- this.statsProvider = checkNotNull(statisticsProvider);
+ this.statsProvider = requireNonNull(statisticsProvider);
return this;
}
@@ -327,7 +327,7 @@ public class FileStoreBuilder {
*/
@NotNull
public FileStoreBuilder withGCOptions(SegmentGCOptions gcOptions) {
- this.gcOptions = checkNotNull(gcOptions);
+ this.gcOptions = requireNonNull(gcOptions);
return this;
}
@@ -339,13 +339,13 @@ public class FileStoreBuilder {
*/
@NotNull
public FileStoreBuilder withSnfeListener(@NotNull SegmentNotFoundExceptionListener snfeListener) {
- this.snfeListener = checkNotNull(snfeListener);
+ this.snfeListener = requireNonNull(snfeListener);
return this;
}
@NotNull
public FileStoreBuilder withIOMonitor(@NotNull IOMonitor ioMonitor) {
- ioMonitors.add(checkNotNull(ioMonitor));
+ ioMonitors.add(requireNonNull(ioMonitor));
return this;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
index 1c117550de..3483ad75b3 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.slf4j.helpers.MessageFormatter.arrayFormat;
import java.io.PrintWriter;
@@ -45,7 +45,7 @@ public class FileStoreGCMonitor implements GCMonitor {
private String status = SegmentGCStatus.IDLE.message();
public FileStoreGCMonitor(@NotNull Clock clock) {
- this.clock = checkNotNull(clock);
+ this.clock = requireNonNull(clock);
}
//------------------------------------------------------------< GCMonitor >---
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
index 741c681cc3..fb80449e83 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.file.tar.GCGeneration.newGCGeneration;
import java.io.IOException;
@@ -76,7 +76,7 @@ public class GCJournal {
return;
}
latest = new GCJournalEntry(repoSize, reclaimedSize,
- System.currentTimeMillis(), gcGeneration, nodes, checkNotNull(root));
+ System.currentTimeMillis(), gcGeneration, nodes, requireNonNull(root));
try {
journalFile.writeLine(latest.toString());
} catch (IOException e) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
index 4c22b24950..d3f132e684 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.segment.file;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.Integer.bitCount;
import static java.lang.Integer.numberOfTrailingZeros;
import static java.lang.Long.numberOfLeadingZeros;
@@ -90,7 +90,7 @@ public class PriorityCache<K, V> {
*/
public static <K, V> Supplier<PriorityCache<K, V>> factory(final int size, @NotNull final Weigher<K, V> weigher) {
checkArgument(bitCount(size) == 1);
- checkNotNull(weigher);
+ requireNonNull(weigher);
return () -> new PriorityCache<>(size, weigher);
}
@@ -177,7 +177,7 @@ public class PriorityCache<K, V> {
this.rehash = rehash;
entries = new Entry<?,?>[size];
fill(entries, Entry.NULL);
- this.weigher = checkNotNull(weigher);
+ this.weigher = requireNonNull(weigher);
numSegments = Math.min(numSegments, size);
checkArgument((size % numSegments) == 0,
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
index 985853de23..85c5d062fc 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyRevisions.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.segment.file.FileStoreUtil.findPersistedRecordId;
@@ -44,7 +44,7 @@ public class ReadOnlyRevisions implements Revisions, Closeable {
private final JournalFile journalFile;
public ReadOnlyRevisions(@NotNull SegmentNodeStorePersistence persistence) {
- this.journalFile = checkNotNull(persistence).getJournalFile();
+ this.journalFile = requireNonNull(persistence).getJournalFile();
this.head = new AtomicReference<>(null);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
index fa04f43483..b83a3eda7e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/Reclaimers.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.guava.common.base.Predicate;
import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType;
@@ -75,7 +75,7 @@ class Reclaimers {
@NotNull final GCGeneration referenceGeneration,
int retainedGenerations) {
- switch (checkNotNull(lastGCType)) {
+ switch (requireNonNull(lastGCType)) {
case FULL:
return newOldFullReclaimer(referenceGeneration, retainedGenerations);
case TAIL:
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
index 057a3db7e1..dff3ff858c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/SafeRunnable.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.Thread.currentThread;
import org.jetbrains.annotations.NotNull;
@@ -54,8 +54,8 @@ class SafeRunnable implements Runnable {
* @param runnable The background operation.
*/
SafeRunnable(@NotNull String name, @NotNull Runnable runnable) {
- this.name = checkNotNull(name);
- this.runnable = checkNotNull(runnable);
+ this.name = requireNonNull(name);
+ this.runnable = requireNonNull(runnable);
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
index 40e3008a61..9d8659718a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.file.tar;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
@@ -128,7 +128,7 @@ public final class GCGeneration {
* @return Number of generations between this generation and {@code gcGeneration}
*/
public int compareWith(@NotNull GCGeneration gcGeneration) {
- return generation - checkNotNull(gcGeneration).generation;
+ return generation - requireNonNull(gcGeneration).generation;
}
/**
@@ -138,7 +138,7 @@ public final class GCGeneration {
* and {@code gcGeneration}
*/
public int compareFullGenerationWith(@NotNull GCGeneration gcGeneration) {
- return fullGeneration - checkNotNull(gcGeneration).fullGeneration;
+ return fullGeneration - requireNonNull(gcGeneration).fullGeneration;
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
index fbd48e15fc..79c4755fc0 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.file.tar;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
@@ -144,7 +144,7 @@ public class TarFiles implements Closeable {
}
public Builder withDirectory(File directory) {
- this.directory = checkNotNull(directory);
+ this.directory = requireNonNull(directory);
return this;
}
@@ -159,22 +159,22 @@ public class TarFiles implements Closeable {
}
public Builder withTarRecovery(TarRecovery tarRecovery) {
- this.tarRecovery = checkNotNull(tarRecovery);
+ this.tarRecovery = requireNonNull(tarRecovery);
return this;
}
public Builder withIOMonitor(IOMonitor ioMonitor) {
- this.ioMonitor = checkNotNull(ioMonitor);
+ this.ioMonitor = requireNonNull(ioMonitor);
return this;
}
public Builder withFileStoreMonitor(FileStoreMonitor fileStoreStats) {
- this.fileStoreMonitor = checkNotNull(fileStoreStats);
+ this.fileStoreMonitor = requireNonNull(fileStoreStats);
return this;
}
public Builder withRemoteStoreMonitor(RemoteStoreMonitor remoteStoreMonitor) {
- this.remoteStoreMonitor = checkNotNull(remoteStoreMonitor);
+ this.remoteStoreMonitor = requireNonNull(remoteStoreMonitor);
return this;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
index 130a3dcce5..4fb6c8cb56 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file.tar;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
@@ -136,7 +136,7 @@ class TarWriter implements Closeable {
}
long writeEntry(long msb, long lsb, byte[] data, int offset, int size, GCGeneration generation) throws IOException {
- checkNotNull(data);
+ requireNonNull(data);
checkPositionIndexes(offset, offset + size, data.length);
synchronized (this) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java
index 1241ffb214..632be0e8b5 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tooling/RevisionHistory.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file.tooling;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.json.JsonSerializer.DEFAULT_FILTER_EXPRESSION;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
@@ -55,7 +55,7 @@ public class RevisionHistory {
* @throws IOException
*/
public RevisionHistory(@NotNull File directory) throws IOException, InvalidFileStoreVersionException {
- this.store = fileStoreBuilder(checkNotNull(directory)).buildReadOnly();
+ this.store = fileStoreBuilder(requireNonNull(directory)).buildReadOnly();
}
private static NodeState getNode(SegmentNodeState root, String path) {
@@ -77,9 +77,9 @@ public class RevisionHistory {
*/
public Iterator<HistoryElement> getHistory(@NotNull JournalFile journal, @NotNull final String path)
throws IOException {
- checkNotNull(path);
+ requireNonNull(path);
- try (JournalReader journalReader = new JournalReader(checkNotNull(journal))) {
+ try (JournalReader journalReader = new JournalReader(requireNonNull(journal))) {
return Iterators.transform(journalReader,
new Function<JournalEntry, HistoryElement>() {
@NotNull @Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
index 3c781583de..8c4cde4659 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Commit.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.scheduler;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder;
@@ -46,12 +46,12 @@ public class Commit {
private volatile GCGeneration gcGeneration;
public Commit(@NotNull NodeBuilder changes, @NotNull CommitHook hook, @NotNull CommitInfo info) {
- checkNotNull(changes);
+ requireNonNull(changes);
checkArgument(changes instanceof SegmentNodeBuilder);
this.changes = (SegmentNodeBuilder) changes;
- this.hook = checkNotNull(hook);
- this.info = checkNotNull(info);
+ this.hook = requireNonNull(hook);
+ this.info = requireNonNull(info);
}
/**
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
index 94e30d27c2..0185a55e5a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.scheduler;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.lang.Thread.currentThread;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -97,7 +97,7 @@ public class LockBasedScheduler implements Scheduler {
public static LockBasedSchedulerBuilder builder(@NotNull Revisions revisions, @NotNull SegmentReader reader,
@NotNull SegmentNodeStoreStats stats) {
- return new LockBasedSchedulerBuilder(checkNotNull(revisions), checkNotNull(reader), checkNotNull(stats));
+ return new LockBasedSchedulerBuilder(requireNonNull(revisions), requireNonNull(reader), requireNonNull(stats));
}
private static final Logger log = LoggerFactory.getLogger(LockBasedScheduler.class);
@@ -325,7 +325,7 @@ public class LockBasedScheduler implements Scheduler {
@Override
public String checkpoint(long lifetime, @NotNull Map<String, String> properties) {
checkArgument(lifetime > 0);
- checkNotNull(properties);
+ requireNonNull(properties);
String name = UUID.randomUUID().toString();
try {
CPCreator cpc = new CPCreator(name, lifetime, properties);
@@ -353,7 +353,7 @@ public class LockBasedScheduler implements Scheduler {
@Override
public boolean removeCheckpoint(String name) {
- checkNotNull(name);
+ requireNonNull(name);
// try 5 times
for (int i = 0; i < 5; i++) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java
index 1cac9730d3..284576581d 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/CompositeIOMonitor.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.spi.monitor;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.newConcurrentHashSet;
import static java.util.Collections.emptySet;
@@ -40,7 +40,7 @@ public class CompositeIOMonitor implements IOMonitor {
* @param ioMonitors {@link IOMonitor} instances to delegate to
*/
public CompositeIOMonitor(@NotNull Iterable<? extends IOMonitor> ioMonitors) {
- this.ioMonitors = newConcurrentHashSet(checkNotNull(ioMonitors));
+ this.ioMonitors = newConcurrentHashSet(requireNonNull(ioMonitors));
}
/**
@@ -60,7 +60,7 @@ public class CompositeIOMonitor implements IOMonitor {
*/
@NotNull
public Registration registerIOMonitor(@NotNull IOMonitor ioMonitor) {
- ioMonitors.add(checkNotNull(ioMonitor));
+ ioMonitors.add(requireNonNull(ioMonitor));
return () -> ioMonitors.remove(ioMonitor);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
index db0c23821a..541e31aa82 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
@@ -17,7 +17,7 @@
*/
package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -61,8 +61,8 @@ public class SegmentCacheStats extends AbstractCacheStats {
@NotNull Supplier<Long> evictionCount) {
super(name);
this.maximumWeight = maximumWeight;
- this.elementCount = checkNotNull(elementCount);
- this.currentWeight = checkNotNull(currentWeight);
+ this.elementCount = requireNonNull(elementCount);
+ this.currentWeight = requireNonNull(currentWeight);
this.evictionCount = evictionCount;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Backup.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Backup.java
index 136346a94d..4d59ae0008 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Backup.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Backup.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.tool.Utils.newBasicReadOnlyBlobStore;
import static org.apache.jackrabbit.oak.segment.tool.Utils.openReadOnlyFileStore;
@@ -68,7 +68,7 @@ public class Backup {
* @return this builder.
*/
public Builder withSource(File source) {
- this.source = checkNotNull(source);
+ this.source = requireNonNull(source);
return this;
}
@@ -81,7 +81,7 @@ public class Backup {
* @return this builder.
*/
public Builder withTarget(File target) {
- this.target = checkNotNull(target);
+ this.target = requireNonNull(target);
return this;
}
@@ -104,8 +104,8 @@ public class Backup {
* @return an instance of {@link Runnable}.
*/
public Backup build() {
- checkNotNull(source);
- checkNotNull(target);
+ requireNonNull(source);
+ requireNonNull(target);
return new Backup(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java
index 268697b3cf..57fdc679d2 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Check.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.text.DateFormat.getDateTimeInstance;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
@@ -105,7 +105,7 @@ public class Check {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -132,7 +132,7 @@ public class Check {
* @return this builder.
*/
public Builder withJournal(File journal) {
- this.journal = checkNotNull(journal);
+ this.journal = requireNonNull(journal);
return this;
}
@@ -270,7 +270,7 @@ public class Check {
* @return an instance of {@link Runnable}.
*/
public Check build() {
- checkNotNull(path);
+ requireNonNull(path);
return new Check(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
index 62fb9af92f..6c11009477 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.difference;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.emptySet;
@@ -96,7 +96,7 @@ public class Compact {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -122,7 +122,7 @@ public class Compact {
* @return this builder.
*/
public Builder withOs(String os) {
- this.os = checkNotNull(os);
+ this.os = requireNonNull(os);
return this;
}
@@ -204,7 +204,7 @@ public class Compact {
* @return an instance of {@link Runnable}.
*/
public Compact build() {
- checkNotNull(path);
+ requireNonNull(path);
return new Compact(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
index 0b5a4a8cbf..045dc23954 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugSegments.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.RecordId.fromString;
import static org.apache.jackrabbit.oak.segment.tool.Utils.openReadOnlyFileStore;
@@ -75,7 +75,7 @@ public class DebugSegments {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -103,7 +103,7 @@ public class DebugSegments {
* @return this builder.
*/
public Builder withSegment(String segment) {
- this.segments.add(checkNotNull(segment));
+ this.segments.add(requireNonNull(segment));
return this;
}
@@ -113,7 +113,7 @@ public class DebugSegments {
* @return an instance of {@link Runnable}.
*/
public DebugSegments build() {
- checkNotNull(path);
+ requireNonNull(path);
checkArgument(!segments.isEmpty());
return new DebugSegments(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugStore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugStore.java
index d7fd3fab7d..c3d4f7786a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugStore.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugStore.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
@@ -73,7 +73,7 @@ public class DebugStore {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -83,7 +83,7 @@ public class DebugStore {
* @return an instance of {@link Runnable}.
*/
public DebugStore build() {
- checkNotNull(path);
+ requireNonNull(path);
return new DebugStore(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
index 05b3c436e5..f534085462 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Sets.newTreeSet;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStateHelper.getTemplateId;
import static org.apache.jackrabbit.oak.segment.tool.Utils.openReadOnlyFileStore;
@@ -83,7 +83,7 @@ public class DebugTars {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -107,7 +107,7 @@ public class DebugTars {
* @return an instance of {@link Runnable}.
*/
public DebugTars build() {
- checkNotNull(path);
+ requireNonNull(path);
checkArgument(!tars.isEmpty());
return new DebugTars(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java
index 70cc2bae61..f9729c0e7b 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.reverse;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.segment.RecordId.fromString;
@@ -78,7 +78,7 @@ public class Diff {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -96,7 +96,7 @@ public class Diff {
* @return this builder.
*/
public Builder withInterval(String interval) {
- this.interval = checkNotNull(interval);
+ this.interval = requireNonNull(interval);
return this;
}
@@ -123,7 +123,7 @@ public class Diff {
* @return this builder.
*/
public Builder withOutput(File file) {
- this.out = checkNotNull(file);
+ this.out = requireNonNull(file);
return this;
}
@@ -136,7 +136,7 @@ public class Diff {
* @return this builder.
*/
public Builder withFilter(String filter) {
- this.filter = checkNotNull(filter);
+ this.filter = requireNonNull(filter);
return this;
}
@@ -161,10 +161,10 @@ public class Diff {
* @return an instance of {@link Runnable}.
*/
public Diff build() {
- checkNotNull(path);
- checkNotNull(interval);
- checkNotNull(out);
- checkNotNull(filter);
+ requireNonNull(path);
+ requireNonNull(interval);
+ requireNonNull(out);
+ requireNonNull(filter);
return new Diff(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/History.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/History.java
index de635aca04..72347b6f8d 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/History.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/History.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.File;
import java.util.Iterator;
@@ -67,7 +67,7 @@ public class History {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -78,7 +78,7 @@ public class History {
* @return this builder.
*/
public Builder withJournal(File journal) {
- this.journal = checkNotNull(journal);
+ this.journal = requireNonNull(journal);
return this;
}
@@ -91,7 +91,7 @@ public class History {
* @return this builder.
*/
public Builder withNode(String node) {
- this.node = checkNotNull(node);
+ this.node = requireNonNull(node);
return this;
}
@@ -115,9 +115,9 @@ public class History {
* @return an instance of {@link History}.
*/
public History build() {
- checkNotNull(path);
- checkNotNull(journal);
- checkNotNull(node);
+ requireNonNull(path);
+ requireNonNull(journal);
+ requireNonNull(node);
return new History(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
index 9fe81f0e07..a493e9a897 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/RecoverJournal.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.oak.segment.tool.Utils.openReadOnlyFileStore;
import static org.apache.jackrabbit.oak.segment.tool.Utils.parseSegmentInfoTimestamp;
@@ -67,17 +67,17 @@ public class RecoverJournal {
}
public Builder withPath(File path) {
- this.path = checkNotNull(path, "path");
+ this.path = requireNonNull(path, "path");
return this;
}
public Builder withOut(PrintStream out) {
- this.out = checkNotNull(out, "out");
+ this.out = requireNonNull(out, "out");
return this;
}
public Builder withErr(PrintStream err) {
- this.err = checkNotNull(err, "err");
+ this.err = requireNonNull(err, "err");
return this;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Restore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Restore.java
index 7a4ab910f7..886eae0c0f 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Restore.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Restore.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.File;
@@ -60,7 +60,7 @@ public class Restore {
* @return this builder.
*/
public Builder withSource(File source) {
- this.source = checkNotNull(source);
+ this.source = requireNonNull(source);
return this;
}
@@ -71,7 +71,7 @@ public class Restore {
* @return this builder.
*/
public Builder withTarget(File target) {
- this.target = checkNotNull(target);
+ this.target = requireNonNull(target);
return this;
}
@@ -81,8 +81,8 @@ public class Restore {
* @return an instance of {@link Runnable}.
*/
public Restore build() {
- checkNotNull(source);
- checkNotNull(target);
+ requireNonNull(source);
+ requireNonNull(target);
return new Restore(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Revisions.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Revisions.java
index 1a02ec2f96..e61eac705b 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Revisions.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Revisions.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.tool.Utils.readRevisions;
import java.io.File;
@@ -59,7 +59,7 @@ public class Revisions {
* @return this builder.
*/
public Builder withPath(File path) {
- this.path = checkNotNull(path);
+ this.path = requireNonNull(path);
return this;
}
@@ -71,7 +71,7 @@ public class Revisions {
* @return this builder.
*/
public Builder withOutput(File out) {
- this.out = checkNotNull(out);
+ this.out = requireNonNull(out);
return this;
}
@@ -81,8 +81,8 @@ public class Revisions {
* @return an instance of {@link Runnable}.
*/
public Revisions build() {
- checkNotNull(path);
- checkNotNull(out);
+ requireNonNull(path);
+ requireNonNull(out);
return new Revisions(this);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/SearchNodes.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/SearchNodes.java
index 84875f9e47..1a88430bea 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/SearchNodes.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/SearchNodes.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.segment.tool;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.segment.tool.Utils.parseSegmentInfoTimestamp;
import java.io.File;
@@ -75,20 +75,20 @@ public class SearchNodes {
}
public Builder withProperty(String name) {
- checkNotNull(name, "name");
+ requireNonNull(name, "name");
matchers.add(node -> node.hasProperty(name));
return this;
}
public Builder withChild(String name) {
- checkNotNull(name, "name");
+ requireNonNull(name, "name");
matchers.add(node -> node.hasChildNode(name));
return this;
}
public Builder withValue(String name, String value) {
- checkNotNull(name, "name");
- checkNotNull(value, "value");
+ requireNonNull(name, "name");
+ requireNonNull(value, "value");
matchers.add(node -> {
PropertyState p = node.getProperty(name);
if (p == null) {
@@ -108,17 +108,17 @@ public class SearchNodes {
}
public Builder withOutput(Output output) {
- this.output = checkNotNull(output, "output");
+ this.output = requireNonNull(output, "output");
return this;
}
public Builder withOut(PrintStream out) {
- this.out = checkNotNull(out, "out");
+ this.out = requireNonNull(out, "out");
return this;
}
public Builder withErr(PrintStream err) {
- this.err = checkNotNull(err, "err");
+ this.err = requireNonNull(err, "err");
return this;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java
index 7915ff9626..99b4244277 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/DefaultIOTraceWriter.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool.iotrace;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.BufferedWriter;
import java.io.PrintWriter;
@@ -41,7 +41,7 @@ public class DefaultIOTraceWriter implements IOTraceWriter {
* @param writer
*/
public DefaultIOTraceWriter(@NotNull Writer writer) {
- out = new PrintWriter(new BufferedWriter(checkNotNull(writer)));
+ out = new PrintWriter(new BufferedWriter(requireNonNull(writer)));
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java
index 8d735c6a4f..5d0bd65204 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTraceLogWriter.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool.iotrace;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class IOTraceLogWriter implements IOTraceWriter {
* @param log
*/
public IOTraceLogWriter(@NotNull Logger log) {
- this.log = checkNotNull(log);
+ this.log = requireNonNull(log);
}
@Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java
index d25c635c07..071456b7cf 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/iotrace/IOTracer.java
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.segment.tool.iotrace;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.Writer;
import java.util.List;
@@ -57,7 +57,7 @@ public class IOTracer {
@NotNull Function<IOMonitor, FileStore> fileStoreFactory,
@NotNull Writer output,
@Nullable String contextSpec) {
- this.fileStoreFactory = checkNotNull(fileStoreFactory);
+ this.fileStoreFactory = requireNonNull(fileStoreFactory);
ioMonitor = new IOTraceMonitor(new DefaultIOTraceWriter(output), contextSpec);
}
@@ -85,8 +85,8 @@ public class IOTracer {
* @param trace
*/
public void collectTrace(@NotNull Trace trace) {
- checkNotNull(trace);
- try (FileStore fileStore = checkNotNull(fileStoreFactory).apply(checkNotNull(ioMonitor))) {
+ requireNonNull(trace);
+ try (FileStore fileStore = requireNonNull(fileStoreFactory).apply(requireNonNull(ioMonitor))) {
trace.run(fileStore.getHead());
} finally {
ioMonitor.flush();
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java
index 34d45c4a9f..77d8bbd4c4 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedSchedulerCheckpointTest.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.scheduler;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -143,7 +143,7 @@ public class LockBasedSchedulerCheckpointTest {
}
private NodeState retrieveCheckpoint(final Scheduler scheduler, final String checkpoint) {
- checkNotNull(checkpoint);
+ requireNonNull(checkpoint);
NodeState cp = scheduler.getHeadNodeState().getChildNode("checkpoints").getChildNode(checkpoint)
.getChildNode("root");
if (cp.exists()) {
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
index 5f0537e737..449c231104 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
@@ -55,7 +55,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Predicates.isNull;
import static org.apache.jackrabbit.guava.common.collect.ImmutableMap.copyOf;
import static org.apache.jackrabbit.guava.common.collect.Iterables.any;
@@ -393,8 +393,8 @@ public class CompositeNodeStore implements NodeStore, PrefetchNodeStore, Observa
private NodeStoreChecks checks;
public Builder(MountInfoProvider mip, NodeStore globalStore) {
- this.mip = checkNotNull(mip, "mountInfoProvider");
- this.globalStore = checkNotNull(globalStore, "globalStore");
+ this.mip = requireNonNull(mip, "mountInfoProvider");
+ this.globalStore = requireNonNull(globalStore, "globalStore");
}
public Builder with(NodeStoreChecks checks) {
@@ -409,10 +409,10 @@ public class CompositeNodeStore implements NodeStore, PrefetchNodeStore, Observa
}
public Builder addMount(String mountName, NodeStore store) {
- checkNotNull(store, "store");
- checkNotNull(mountName, "mountName");
+ requireNonNull(store, "store");
+ requireNonNull(mountName, "mountName");
- Mount mount = checkNotNull(mip.getMountByName(mountName), "No mount with name '%s' found in %s", mountName, mip.getNonDefaultMounts());
+ Mount mount = requireNonNull(mip.getMountByName(mountName), String.format("No mount with name '%s' found in %s", mountName, mip.getNonDefaultMounts()));
nonDefaultStores.add(new MountedNodeStore(mount, store));
return this;
}
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java
index 7a2c6dfedd..9bd69fb8d1 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeMountedNodeStoreChecker.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.composite.checks;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.util.Set;
@@ -73,8 +73,8 @@ public class NodeTypeMountedNodeStoreChecker implements
}
protected void activate(ComponentContext ctx) {
- invalidNodeType = checkNotNull(PropertiesUtil.toString(ctx.getProperties().get(INVALID_NODE_TYPE), null), INVALID_NODE_TYPE);
- errorLabel = checkNotNull(PropertiesUtil.toString(ctx.getProperties().get(ERROR_LABEL), null), ERROR_LABEL);
+ invalidNodeType = requireNonNull(PropertiesUtil.toString(ctx.getProperties().get(INVALID_NODE_TYPE), null), INVALID_NODE_TYPE);
+ errorLabel = requireNonNull(PropertiesUtil.toString(ctx.getProperties().get(ERROR_LABEL), null), ERROR_LABEL);
excludedNodeTypes = ImmutableSet.copyOf(PropertiesUtil.toStringArray(ctx.getProperties().get(EXCLUDED_NODE_TYPES), new String[0]));
}
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
index 88851465e0..17efee6369 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.composite.impl;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -86,7 +86,7 @@ public class NonDefaultMountWriteReportingObserver implements Observer {
// have been accumulated
@Override
public final synchronized void contentChanged(NodeState root, CommitInfo info) {
- checkNotNull(root);
+ requireNonNull(root);
if (oldState != null) {
CountingDiff diff = new CountingDiff("/", new LinkedHashMap<>());
root.compareAgainstBaseState(oldState, diff);
diff --git a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeStoreChecksServiceTest.java b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeStoreChecksServiceTest.java
index 6d69678049..d945689c18 100644
--- a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeStoreChecksServiceTest.java
+++ b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeStoreChecksServiceTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.composite.checks;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.spi.mount.Mounts.defaultMountInfoProvider;
import java.util.Arrays;
@@ -89,7 +89,7 @@ public class NodeStoreChecksServiceTest {
private final String name;
private FailOnTreeNameChecker(String name) {
- this.name = checkNotNull(name, "name shold not be null");
+ this.name = requireNonNull(name, "name shold not be null");
}
@Override
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java
index f05a5ba152..fe0b8051b1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
import org.apache.jackrabbit.guava.common.collect.Maps;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
/**
* Queues updates on a commit root document and batches them into a single
@@ -48,7 +48,7 @@ final class BatchCommitQueue {
private final DocumentStore store;
BatchCommitQueue(@NotNull DocumentStore store) {
- this.store = checkNotNull(store);
+ this.store = requireNonNull(store);
}
Callable<NodeDocument> updateDocument(UpdateOp op) {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
index 56040cf770..be375200c1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
@@ -78,7 +78,7 @@ class Branch {
@NotNull RevisionVector base,
@NotNull ReferenceQueue<Object> queue,
@Nullable Object guard) {
- checkArgument(!checkNotNull(base).isBranch(), "base is not a trunk revision: %s", base);
+ checkArgument(!requireNonNull(base).isBranch(), "base is not a trunk revision: %s", base);
this.base = base;
this.commits = new ConcurrentSkipListMap<Revision, BranchCommit>(commits.comparator());
for (Revision r : commits) {
@@ -110,7 +110,7 @@ class Branch {
*/
@NotNull
RevisionVector getBase(@NotNull Revision r) {
- BranchCommit c = commits.get(checkNotNull(r).asBranchRevision());
+ BranchCommit c = commits.get(requireNonNull(r).asBranchRevision());
if (c == null) {
throw new IllegalArgumentException(
"Revision " + r + " is not a commit in this branch");
@@ -127,8 +127,8 @@ class Branch {
* branch revision.
*/
void rebase(@NotNull Revision head, @NotNull RevisionVector base) {
- checkArgument(checkNotNull(head).isBranch(), "Not a branch revision: %s", head);
- checkArgument(!checkNotNull(base).isBranch(), "Not a trunk revision: %s", base);
+ checkArgument(requireNonNull(head).isBranch(), "Not a branch revision: %s", head);
+ checkArgument(!requireNonNull(base).isBranch(), "Not a trunk revision: %s", base);
Revision last = commits.lastKey();
checkArgument(head.compareRevisionTime(last) > 0);
commits.put(head, new RebaseCommit(base, head, commits));
@@ -141,7 +141,7 @@ class Branch {
* @throws IllegalArgumentException if r is not a branch revision.
*/
void addCommit(@NotNull Revision r) {
- checkArgument(checkNotNull(r).isBranch(), "Not a branch revision: %s", r);
+ checkArgument(requireNonNull(r).isBranch(), "Not a branch revision: %s", r);
Revision last = commits.lastKey();
checkArgument(commits.comparator().compare(r, last) > 0);
commits.put(r, new BranchCommitImpl(commits.get(last).getBase(), r));
@@ -170,7 +170,7 @@ class Branch {
* revision; <code>false</code> otherwise.
*/
boolean containsCommit(@NotNull Revision r) {
- return commits.containsKey(checkNotNull(r).asBranchRevision());
+ return commits.containsKey(requireNonNull(r).asBranchRevision());
}
/**
@@ -182,7 +182,7 @@ class Branch {
*/
@Nullable
BranchCommit getCommit(@NotNull Revision r) {
- return commits.get(checkNotNull(r).asBranchRevision());
+ return commits.get(requireNonNull(r).asBranchRevision());
}
/**
@@ -202,7 +202,7 @@ class Branch {
* @throws IllegalArgumentException if r is not a branch revision.
*/
public void removeCommit(@NotNull Revision r) {
- checkArgument(checkNotNull(r).isBranch(), "Not a branch revision: %s", r);
+ checkArgument(requireNonNull(r).isBranch(), "Not a branch revision: %s", r);
commits.remove(r);
}
@@ -215,7 +215,7 @@ class Branch {
*/
public void applyTo(@NotNull UnsavedModifications trunk,
@NotNull Revision mergeCommit) {
- checkNotNull(trunk);
+ requireNonNull(trunk);
for (BranchCommit c : commits.values()) {
c.applyTo(trunk, mergeCommit);
}
@@ -253,9 +253,9 @@ class Branch {
* {@code false} otherwise.
*/
public boolean isHead(@NotNull Revision rev) {
- checkArgument(checkNotNull(rev).isBranch(),
+ checkArgument(requireNonNull(rev).isBranch(),
"Not a branch revision: %s", rev);
- return checkNotNull(rev).equals(commits.lastKey());
... 3728 lines suppressed ...