This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11618b in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit d67b5d050a1772e1baa15495d37d9b120c4bf1be Author: Julian Reschke <[email protected]> AuthorDate: Wed Apr 9 14:41:35 2025 +0100 OAK-11618: Remove usage of Guava Stopwatch --- .../external/impl/ExternalLoginModule.java | 2 +- .../scalability/suites/ScalabilityBlobSearchSuite.java | 2 +- .../oak/scalability/suites/ScalabilityNodeSuite.java | 3 +-- .../oak/benchmark/ContinuousRevisionGCTest.java | 3 +-- .../apache/jackrabbit/oak/benchmark/RevisionGCTest.java | 2 +- .../segment/standby/StandbyBulkTransferBenchmark.java | 2 +- .../scalability/suites/ScalabilityAbstractSuite.java | 2 +- .../plugins/blob/AbstractSharedCachingDataStore.java | 2 +- .../apache/jackrabbit/oak/plugins/blob/FileCache.java | 2 +- .../oak/plugins/blob/MarkSweepGarbageCollector.java | 2 +- .../oak/plugins/blob/datastore/BlobIdTracker.java | 2 +- .../jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 2 +- .../jackrabbit/oak/plugins/index/FormattingUtils.java | 2 +- .../jackrabbit/oak/plugins/index/MetricsFormatter.java | 2 +- .../oak/plugins/index/TrackingCorruptIndexHandler.java | 10 ++-------- .../oak/plugins/index/importer/IndexImporter.java | 2 +- .../index/progress/IndexingProgressReporter.java | 2 +- .../oak/plugins/index/progress/SimpleRateEstimator.java | 4 ++-- .../oak/plugins/index/property/RecursiveDelete.java | 2 +- .../jackrabbit/oak/security/user/AuthorizableImpl.java | 2 +- .../apache/jackrabbit/oak/security/user/GroupImpl.java | 2 +- .../jackrabbit/oak/security/user/UserImporter.java | 2 +- .../oak/plugins/index/FormattingUtilsTest.java | 10 ++-------- .../observation/filter/ChangeSetFilterImplTest.java | 2 +- .../oak/plugins/index/lucene/LuceneIndexMBeanImpl.java | 2 +- .../index/lucene/directory/IndexConsistencyChecker.java | 2 +- .../index/lucene/property/PropertyIndexCleaner.java | 3 +-- .../util/StatisticalSortedSetDocValuesFacetCounts.java | 2 +- .../plugins/index/lucene/hybrid/DocumentQueueTest.java | 2 +- .../jackrabbit/oak/index/OutOfBandIndexerBase.java | 2 +- .../indexer/document/DocumentStoreIndexerBase.java | 2 +- .../indexer/document/flatfile/NodeStateEntrySorter.java | 2 +- .../indexer/document/flatfile/StoreAndSortStrategy.java | 2 +- .../document/flatfile/TraverseWithSortStrategy.java | 2 +- .../flatfile/pipelined/PipelinedMergeSortTask.java | 2 +- .../flatfile/pipelined/PipelinedMongoDownloadTask.java | 2 +- .../flatfile/pipelined/PipelinedSortBatchTask.java | 2 +- .../document/flatfile/pipelined/PipelinedStrategy.java | 2 +- .../flatfile/pipelined/PipelinedTransformTask.java | 2 +- .../flatfile/pipelined/PipelinedTreeStoreStrategy.java | 2 +- .../flatfile/pipelined/PipelinedTreeStoreTask.java | 2 +- .../document/flatfile/pipelined/ThreadMonitor.java | 2 +- .../IncrementalFlatFileStoreStrategy.java | 2 +- .../oak/plugins/document/DocumentNodeStoreHelper.java | 2 +- .../pipelined/PipelinedMongoConnectionFailureIT.java | 2 +- .../jackrabbit/oak/index/ElasticIndexCommand.java | 2 +- .../jackrabbit/oak/exporter/NodeStateExportCommand.java | 2 +- .../org/apache/jackrabbit/oak/index/IndexCommand.java | 2 +- .../oak/index/IndexConsistencyCheckPrinter.java | 2 +- .../jackrabbit/oak/plugins/document/check/ETA.java | 2 +- .../jackrabbit/oak/plugins/document/check/Summary.java | 2 +- .../jackrabbit/oak/plugins/tika/TextPopulator.java | 2 +- .../jackrabbit/oak/run/DataStoreCheckCommand.java | 4 ++-- .../org/apache/jackrabbit/oak/run/DataStoreCommand.java | 4 ++-- .../oak/plugins/index/search/BadIndexTracker.java | 17 +++-------------- .../security/authentication/AbstractLoginModule.java | 3 +-- .../oak/segment/aws/AwsSegmentArchiveWriter.java | 2 +- .../jackrabbit/oak/segment/aws/tool/AwsCompact.java | 2 +- .../jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java | 3 +-- .../jackrabbit/oak/segment/aws/tool/AwsToolUtils.java | 4 +--- .../segment/azure/AzureHttpRequestLoggingPolicy.java | 2 +- .../oak/segment/azure/AzureSegmentArchiveWriter.java | 2 +- .../jackrabbit/oak/segment/azure/tool/AzureCompact.java | 2 +- .../jackrabbit/oak/segment/azure/tool/SegmentCopy.java | 2 +- .../jackrabbit/oak/segment/azure/tool/ToolUtils.java | 2 +- .../segment/azure/v8/AzureSegmentArchiveWriterV8.java | 2 +- .../azure/AzureHttpRequestLoggingTestingPolicy.java | 2 +- .../remote/AbstractRemoteSegmentArchiveReader.java | 2 +- .../remote/persistentcache/PersistentDiskCache.java | 3 +-- .../remote/persistentcache/PersistentRedisCache.java | 2 +- .../jackrabbit/oak/backup/impl/FileStoreBackupImpl.java | 2 +- .../oak/backup/impl/FileStoreRestoreImpl.java | 2 +- .../jackrabbit/oak/segment/file/PrintableStopwatch.java | 4 ++-- .../oak/segment/file/tar/SegmentTarReader.java | 3 +-- .../oak/segment/file/tar/SegmentTarWriter.java | 3 +-- .../persistentcache/AbstractPersistentCache.java | 2 +- .../standby/client/StandbyClientSyncExecution.java | 3 +-- .../org/apache/jackrabbit/oak/segment/tool/Compact.java | 2 +- .../org/apache/jackrabbit/oak/segment/RecordTest.java | 2 +- .../oak/segment/SegmentDataStoreBlobGCIT.java | 2 +- .../oak/plugins/document/ClusterNodeInfo.java | 2 +- .../oak/plugins/document/DocumentNodeStore.java | 2 +- .../oak/plugins/document/JournalDiffLoader.java | 2 +- .../oak/plugins/document/JournalGarbageCollector.java | 2 +- .../oak/plugins/document/UnsavedModifications.java | 3 +-- .../oak/plugins/document/VersionGarbageCollector.java | 2 +- .../oak/plugins/document/mongo/MongoDocumentStore.java | 2 +- .../oak/plugins/document/rdb/RDBDocumentStore.java | 2 +- .../document/secondary/SecondaryStoreObserver.java | 2 +- .../oak/plugins/document/DocumentMKCommitAddTest.java | 2 +- .../oak/plugins/document/MongoBlobGCTest.java | 2 +- .../oak/plugins/document/VersionGCStatsTest.java | 2 +- .../plugins/document/mongo/ReplicaSetResilienceIT.java | 2 +- .../oak/plugins/document/prefetch/CacheWarmingTest.java | 2 +- .../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 2 +- 95 files changed, 103 insertions(+), 138 deletions(-) diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java index f79b9439e3..71b36620c7 100644 --- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java +++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.AuthInfo; import org.apache.jackrabbit.oak.api.CommitFailedException; diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java index 24e386040a..8219849ba5 100644 --- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java +++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java @@ -37,7 +37,7 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.version.VersionException; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java index dadcbf91d6..6d5b041d91 100644 --- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java +++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java @@ -36,14 +36,13 @@ import javax.jcr.Session; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean; import org.apache.jackrabbit.oak.benchmark.util.OakIndexUtils; import org.apache.jackrabbit.oak.benchmark.util.OakLuceneIndexUtils; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.fixture.JcrCreator; import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java index e1d2af7366..af43431140 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java @@ -23,8 +23,7 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.spi.state.NodeStore; /** diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java index ec14dc9940..6ae2a18cdc 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * A benchmark to run RevisionGC. diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java index ff3ea233b8..4803820b78 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/benchmarks/segment/standby/StandbyBulkTransferBenchmark.java @@ -23,7 +23,7 @@ import java.lang.management.ManagementFactory; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import javax.jcr.Credentials; import javax.jcr.Repository; import javax.management.MBeanServer; diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java index cb714edff9..06cf538da2 100644 --- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java +++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java @@ -37,13 +37,13 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics; import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator; import org.apache.jackrabbit.oak.commons.Profiler; import org.apache.jackrabbit.oak.commons.conditions.Validate; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.scalability.ScalabilitySuite; import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java index d70f847b43..235f106ed5 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java @@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java index 847d41d0f1..56a37e5867 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java @@ -43,11 +43,11 @@ import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.io.FileTreeTraverser; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.cache.AbstractCache; /** 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 716d86f607..3f0610914f 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 @@ -57,7 +57,7 @@ import java.util.stream.Collectors; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFutureTask; import org.apache.commons.io.FileUtils; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java index 2f406d0dae..b523348ade 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Predicate; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; 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 c57297bda8..c9f2a22f92 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 @@ -99,7 +99,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class AsyncIndexUpdate implements Runnable, Closeable { /** diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java index 34d391a0f6..5970f6a3fe 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.util.concurrent.TimeUnit; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java index 867e748dc5..c16866fd53 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java @@ -16,9 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.util.concurrent.TimeUnit; 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 c82fa461f3..41795f6a4e 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 @@ -35,9 +35,8 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.base.Throwables; -import org.apache.jackrabbit.guava.common.base.Ticker; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.MeterStats; import org.slf4j.Logger; @@ -168,12 +167,7 @@ public class TrackingCorruptIndexHandler implements CorruptIndexHandler { private final String asyncName; private final String path; private final long lastIndexerCycleCount = indexerCycleCount; - private final Stopwatch watch = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); + private final Stopwatch watch = Stopwatch.createStarted(clock); private String exception = ""; private int failureCount; 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 a3dda4e6df..8566381b78 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 @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.index.importer; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java index 527578556c..364915771f 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/IndexingProgressReporter.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.spi.commit.Editor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class IndexingProgressReporter implements NodeTraversalCallback { private static final String REINDEX_MSG = "Reindexing"; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java index 0abebb37d0..4aad7906d5 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java @@ -19,9 +19,9 @@ package org.apache.jackrabbit.oak.plugins.index.progress; -import java.util.concurrent.TimeUnit; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import java.util.concurrent.TimeUnit; public class SimpleRateEstimator implements TraversalRateEstimator { private final Stopwatch w = Stopwatch.createStarted(); diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java index 5b52849129..68130b7b66 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.index.property; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java index 2695a32340..a5328cf19b 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java @@ -16,13 +16,13 @@ */ package org.apache.jackrabbit.oak.security.user; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.tree.TreeAware; import org.apache.jackrabbit.oak.security.user.monitor.UserMonitor; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java index 2175e960b1..cefa8eec02 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.security.user; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; import org.apache.jackrabbit.api.security.user.UserManager; 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 19f6b85061..754980739d 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 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.security.user; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.api.JackrabbitSession; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java index 2bc0637928..51706192ae 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java @@ -16,8 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Ticker; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.stats.NonTickingTestClock; import org.junit.Test; @@ -29,12 +28,7 @@ public class FormattingUtilsTest { private final NonTickingTestClock clock = new NonTickingTestClock(); - private final Stopwatch sw = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); + private final Stopwatch sw = Stopwatch.createStarted(clock); @Test public void formatToSeconds() { diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java index 641adb7901..46648e9c94 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.observation.ChangeSet; import org.apache.jackrabbit.oak.spi.observation.ChangeSetBuilder; 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 71ab225d41..5f6337e748 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 @@ -94,7 +94,7 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.TreeTraverser; public class LuceneIndexMBeanImpl extends AnnotatedStandardMBean implements LuceneIndexMBean { 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 3f38f68b8a..b1b755aa1c 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 @@ -32,7 +32,7 @@ import java.util.List; import javax.jcr.PropertyType; import org.apache.commons.io.input.CountingInputStream; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; 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 4dea930ba7..fa56165761 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 @@ -38,6 +38,7 @@ import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider; @@ -64,8 +65,6 @@ import org.apache.jackrabbit.oak.stats.TimerStats; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - public class PropertyIndexCleaner implements Runnable{ private final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java index 0676166466..6c4be4a070 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.util; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.SecureFacetConfiguration; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java index 807838c612..0daf427544 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueueTest.java @@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier; 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 1991b60a94..24c8d3d6e0 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 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index; import com.codahale.metrics.MetricRegistry; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.index.*; 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 72fb3607fe..2995934b84 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 @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.index.indexer.document; import com.codahale.metrics.MetricRegistry; import com.mongodb.MongoClientURI; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java index 3211149925..4d6a2d2777 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntrySorter.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.commons.Compression; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java index 2e3575ed5d..9ba31e17a1 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.index.indexer.document.LastModifiedRange; import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry; import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntryTraverser; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java index 47ff8d149b..d00474250c 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TraverseWithSortStrategy.java @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.sort.ExternalSort; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedStrategy; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java index 111b282d55..0c8bc6df83 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.conditions.Validate; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java index 67a77ebdff..c0c4eb09b9 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java @@ -33,7 +33,7 @@ import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java index a375337ca3..9f8c99c3eb 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java index 5adbfed287..0f62b22b3d 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientURI; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.util.concurrent.ThreadFactoryBuilder; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java index 9a17f11388..97e58ceb2c 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTransformTask.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.NodeStateEntryWriter; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java index 7d066a39fb..ad244d07b4 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java @@ -21,12 +21,12 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import com.mongodb.MongoClientSettings; import com.mongodb.MongoClientURI; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.util.concurrent.ThreadFactoryBuilder; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.conditions.Validate; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.NodeStateEntryWriter; import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreSortStrategyBase; import org.apache.jackrabbit.oak.index.indexer.document.tree.TreeStore; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java index dbf548128e..fe711add40 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java @@ -33,7 +33,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java index 53200f60ba..b505a2a326 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.index.FormattingUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java index 6d29527913..5b484f827a 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.incrementalstore; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStoreUtils; import org.apache.jackrabbit.oak.index.indexer.document.flatfile.NodeStateEntrySorter; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java index 4cb99399e4..ba0d894096 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.bson.conversions.Bson; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import com.mongodb.BasicDBObject; import com.mongodb.client.FindIterable; import com.mongodb.client.MongoCollection; diff --git a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java index 4816477f0e..489a88d151 100644 --- a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java +++ b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java @@ -22,8 +22,8 @@ import eu.rekawek.toxiproxy.Proxy; import eu.rekawek.toxiproxy.ToxiproxyClient; import eu.rekawek.toxiproxy.model.ToxicDirection; import eu.rekawek.toxiproxy.model.toxic.LimitData; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.MongoUtils; 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 603dddc510..b5fc98afeb 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 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java index 586a5772bb..7af6942668 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.exporter; import java.io.File; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import joptsimple.OptionParser; import org.apache.jackrabbit.oak.run.cli.CommonOptions; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixture; 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 0d77b88229..cc76068bb8 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 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.felix.inventory.Format; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java index 433d53ae33..b22b836879 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java @@ -25,10 +25,10 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.commons.io.output.WriterOutputStream; import org.apache.felix.inventory.Format; import org.apache.felix.inventory.InventoryPrinter; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker.Level; import org.apache.jackrabbit.oak.spi.state.NodeState; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java index e74a47c7c2..3095e7891a 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document.check; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.util.ISO8601; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java index 624e4a72f8..3d7f1d4f4d 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/Summary.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document.check; import java.util.concurrent.BlockingQueue; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java index 8d2df2e16d..2756315d91 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.tika; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java index 5eb8b15fb2..2e5ff839fe 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.run; -import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted; +import static org.apache.jackrabbit.oak.commons.time.Stopwatch.createStarted; import static java.io.File.createTempFile; import static java.util.Arrays.asList; import static org.apache.commons.io.FileUtils.forceDelete; @@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; 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 8bf3d3a9d5..acc0e69210 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 @@ -40,7 +40,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.commons.io.LineIterator; @@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted; +import static org.apache.jackrabbit.oak.commons.time.Stopwatch.createStarted; import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort; import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeAsLine; import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings; diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java index 1512cfa7d9..e8648087ff 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java @@ -24,9 +24,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.base.Throwables; -import org.apache.jackrabbit.guava.common.base.Ticker; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -156,18 +155,8 @@ public class BadIndexTracker { final int lastIndexerCycleCount = indexerCycleCount; private final long createdTime = clock.millis(); private final boolean persistedIndex; - private final Stopwatch created = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); - private final Stopwatch watch = Stopwatch.createStarted(new Ticker() { - @Override - public long read() { - return TimeUnit.MILLISECONDS.toNanos(clock.millis()); - } - }); + private final Stopwatch created = Stopwatch.createStarted(clock); + private final Stopwatch watch = Stopwatch.createStarted(clock); private String exception; private int accessCount; private int failedAccessCount; diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java index c54b28d64b..5eb2dac599 100644 --- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java +++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java @@ -36,14 +36,13 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.collect.ImmutableSet; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.api.AuthInfo; import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.commons.jdkcompat.Java23Subject; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java index ccf83cd934..221f39fef2 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java @@ -23,7 +23,7 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWriter; 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 c452eb9e63..c9f2cf93a5 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 @@ -29,7 +29,7 @@ import java.nio.file.Files; import java.util.Collections; import java.util.List; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.SegmentStoreType; 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 7c7696f7d6..861a4c1076 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 @@ -27,8 +27,7 @@ import static org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.storeTypeF import java.io.PrintWriter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.aws.tool.AwsToolUtils.SegmentStoreType; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Check; diff --git a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java index e76d18bf86..8c7ce57c9e 100644 --- a/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java +++ b/oak-segment-aws/src/main/java/org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java @@ -24,13 +24,11 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.lang.annotation.Annotation; -import java.net.URISyntaxException; import java.text.MessageFormat; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.aws.AwsContext; import org.apache.jackrabbit.oak.segment.aws.AwsPersistence; import org.apache.jackrabbit.oak.segment.aws.Configuration; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java index 0c59c5d343..af9a642276 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java @@ -22,7 +22,7 @@ import com.azure.core.http.HttpPipelineCallContext; import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java index e9b9f5d8a7..05614221c0 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java @@ -20,8 +20,8 @@ import com.azure.core.util.BinaryData; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.models.BlobStorageException; import com.azure.storage.blob.specialized.BlockBlobClient; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.azure.util.Retrier; import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWriter; import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; 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 1a61d9fcb6..492e3dbf92 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 @@ -28,7 +28,7 @@ import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.models.BlobItem; import com.azure.storage.blob.models.BlobListDetails; import com.azure.storage.blob.models.ListBlobsOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.azure.AzurePersistence; 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 cfed41d3cf..0fda1f5052 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 @@ -55,7 +55,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Check; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * Perform a full-copy of repository data at segment level. diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java index e41e6f5350..18950da3c0 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java @@ -54,7 +54,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersist import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.CachingPersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.PersistentCache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; diff --git a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java index 21ecfe8d76..89ae33763a 100644 --- a/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java +++ b/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java @@ -26,12 +26,12 @@ import java.net.URISyntaxException; import java.util.concurrent.TimeUnit; import com.microsoft.azure.storage.blob.BlobRequestOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import com.microsoft.azure.storage.blob.CloudBlockBlob; import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.azure.AzureBlobMetadata; import org.apache.jackrabbit.oak.segment.azure.util.AzureRequestOptionsV8; import org.apache.jackrabbit.oak.segment.remote.WriteAccessController; diff --git a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java index d76554e3ca..d98d82025d 100644 --- a/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java +++ b/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java @@ -22,7 +22,7 @@ import com.azure.core.http.HttpPipelineCallContext; import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java index d65490eaf0..4ae8ad2463 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/AbstractRemoteSegmentArchiveReader.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.segment.remote; import static org.apache.jackrabbit.oak.segment.remote.RemoteUtilities.getSegmentFileName; import static org.apache.jackrabbit.oak.segment.remote.RemoteUtilities.OFF_HEAP; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java index 1a1713f87e..ce00a425a3 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java @@ -17,12 +17,11 @@ */ package org.apache.jackrabbit.oak.segment.remote.persistentcache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.io.UncheckedIOException; import java.nio.file.NoSuchFileException; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.commons.Buffer; -import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.AbstractPersistentCache; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.SegmentCacheStats; import org.jetbrains.annotations.NotNull; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java index 52df79cdfb..204484e23c 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentRedisCache.java @@ -17,8 +17,8 @@ */ package org.apache.jackrabbit.oak.segment.remote.persistentcache; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.AbstractPersistentCache; import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.SegmentCacheStats; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java index 14c3d62067..d489237885 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java @@ -24,7 +24,7 @@ import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreB import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.backup.FileStoreBackup; import org.apache.jackrabbit.oak.segment.ClassicCompactor; import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java index 3f2c3ffa8f..71133f88c9 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java @@ -24,7 +24,7 @@ import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreB import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.backup.FileStoreRestore; import org.apache.jackrabbit.oak.segment.DefaultSegmentWriter; import org.apache.jackrabbit.oak.segment.ClassicCompactor; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java index 5b665413a8..aafdf92e35 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java @@ -18,9 +18,9 @@ package org.apache.jackrabbit.oak.segment.file; -import java.util.concurrent.TimeUnit; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import java.util.concurrent.TimeUnit; /** * A stopwatch that is also pretty-printable for usage in log messages. diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java index 29ed0c4551..afc924e49b 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java @@ -29,9 +29,8 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexLoader; import org.apache.jackrabbit.oak.segment.file.tar.binaries.InvalidBinaryReferencesIndexException; import org.apache.jackrabbit.oak.segment.file.tar.index.Index; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java index 1068cbbb1e..ee2c68a29e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java @@ -33,10 +33,9 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.zip.CRC32; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.commons.conditions.Validate; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry; import org.apache.jackrabbit.oak.segment.file.tar.index.IndexWriter; import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java index e57689691d..f9b2170cfe 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache; import static java.lang.Thread.currentThread; import static java.util.concurrent.TimeUnit.SECONDS; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.commons.Buffer; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java index 6d05a6f8e0..aafd7aa621 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSyncExecution.java @@ -23,8 +23,7 @@ import java.util.Set; import java.util.UUID; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.SegmentId; import org.apache.jackrabbit.oak.segment.SegmentIdProvider; 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 c49115f943..041fc31e04 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 @@ -34,7 +34,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.GCType; diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java index 2c0e8a47d1..e13453db72 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java index 609c21f034..efb2b67349 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java @@ -42,7 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import ch.qos.logback.classic.Level; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.jackrabbit.oak.api.Blob; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java index c3762c0f29..25b6eefc07 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java @@ -39,7 +39,7 @@ import java.util.TreeSet; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.UUIDUtils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index 1acad841bd..3a27257531 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -134,7 +134,7 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.base.Suppliers; /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 1550620902..b3820aa6cd 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java index bae0cd9db8..95056a71d4 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalGarbageCollector.java @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.jackrabbit.oak.plugins.document.Collection.SETTINGS; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java index cc79ba2efb..119d58454d 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java @@ -29,6 +29,7 @@ import java.util.concurrent.locks.Lock; import java.util.function.Supplier; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.util.MapFactory; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.jetbrains.annotations.NotNull; @@ -36,8 +37,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; - import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.oak.plugins.document.Collection.CLUSTER_NODES; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java index 271604d61f..7b6092ffee 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java @@ -42,7 +42,7 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.StreamSupport; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.sort.StringSort; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index 060a90d2a6..ade52c5561 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -43,7 +43,7 @@ import java.util.stream.StreamSupport; import org.apache.commons.io.IOUtils; import com.mongodb.client.model.IndexOptions; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.guava.common.util.concurrent.AtomicDouble; import com.mongodb.Block; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index 3827972c76..d89078f866 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -90,7 +90,7 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java index 2ec1d9a5b5..96926b32d3 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java @@ -22,8 +22,8 @@ package org.apache.jackrabbit.oak.plugins.document.secondary; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState; import org.apache.jackrabbit.oak.plugins.document.NodeStateDiffer; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java index 898b17144b..5fc533ed4b 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.json.simple.JSONObject; import org.junit.Ignore; import org.junit.Test; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java index aa4a58ff6f..083ae5154e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; import ch.qos.logback.classic.Level; import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.guava.common.base.Splitter; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import com.mongodb.BasicDBObject; import com.mongodb.ReadPreference; import com.mongodb.client.MongoCollection; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java index 04793a0992..68da6fa09e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.junit.Before; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java index 77d949da48..b58fbc6b78 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReplicaSetResilienceIT.java @@ -32,11 +32,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.guava.common.base.Stopwatch; import com.mongodb.MongoClient; import com.mongodb.MongoClientOptions; import com.mongodb.ServerAddress; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.MongoUtils; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java index dc50d25f3e..5145eba019 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java @@ -59,7 +59,7 @@ import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class CacheWarmingTest { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java index 4c4f3a1fa0..0865ba1808 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java @@ -55,7 +55,7 @@ import javax.jcr.nodetype.NodeTypeTemplate; import javax.jcr.nodetype.PropertyDefinitionTemplate; import javax.jcr.security.Privilege; -import org.apache.jackrabbit.guava.common.base.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.commons.collections4.bidimap.DualHashBidiMap;
