This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11618 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b62d29041a01798a973885388eebe559a98fa085 Author: Julian Reschke <[email protected]> AuthorDate: Wed Apr 9 11:42:01 2025 +0100 OAK-11618: Remove usage of Guava Stopwatch - work in progress --- .../security/authentication/external/impl/ExternalLoginModule.java | 2 +- .../oak/scalability/suites/ScalabilityBlobSearchSuite.java | 2 +- .../jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java | 2 +- .../apache/jackrabbit/oak/benchmark/ContinuousRevisionGCTest.java | 2 +- .../java/org/apache/jackrabbit/oak/benchmark/RevisionGCTest.java | 2 +- .../benchmarks/segment/standby/StandbyBulkTransferBenchmark.java | 2 +- .../jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java | 2 +- .../jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java | 2 +- .../main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java | 2 +- .../jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java | 2 +- .../apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java | 2 +- .../main/java/org/apache/jackrabbit/oak/commons/time}/Stopwatch.java | 5 +++-- .../org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 2 +- .../org/apache/jackrabbit/oak/plugins/index/FormattingUtils.java | 2 +- .../org/apache/jackrabbit/oak/plugins/index/MetricsFormatter.java | 2 +- .../jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java | 2 +- .../apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java | 2 +- .../oak/plugins/index/progress/IndexingProgressReporter.java | 2 +- .../jackrabbit/oak/plugins/index/progress/SimpleRateEstimator.java | 2 +- .../jackrabbit/oak/plugins/index/property/RecursiveDelete.java | 2 +- .../org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java | 2 +- .../main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java | 2 +- .../java/org/apache/jackrabbit/oak/security/user/UserImporter.java | 2 +- .../org/apache/jackrabbit/oak/plugins/index/FormattingUtilsTest.java | 2 +- .../oak/plugins/observation/filter/ChangeSetFilterImplTest.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java | 2 +- .../oak/plugins/index/lucene/directory/IndexConsistencyChecker.java | 2 +- .../oak/plugins/index/lucene/property/PropertyIndexCleaner.java | 2 +- .../index/lucene/util/StatisticalSortedSetDocValuesFacetCounts.java | 2 +- .../oak/plugins/index/lucene/hybrid/DocumentQueueTest.java | 2 +- .../java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java | 2 +- .../oak/index/indexer/document/DocumentStoreIndexerBase.java | 2 +- .../oak/index/indexer/document/flatfile/NodeStateEntrySorter.java | 2 +- .../oak/index/indexer/document/flatfile/StoreAndSortStrategy.java | 2 +- .../index/indexer/document/flatfile/TraverseWithSortStrategy.java | 2 +- .../indexer/document/flatfile/pipelined/PipelinedMergeSortTask.java | 2 +- .../document/flatfile/pipelined/PipelinedMongoDownloadTask.java | 2 +- .../indexer/document/flatfile/pipelined/PipelinedSortBatchTask.java | 2 +- .../index/indexer/document/flatfile/pipelined/PipelinedStrategy.java | 2 +- .../indexer/document/flatfile/pipelined/PipelinedTransformTask.java | 2 +- .../document/flatfile/pipelined/PipelinedTreeStoreStrategy.java | 2 +- .../indexer/document/flatfile/pipelined/PipelinedTreeStoreTask.java | 2 +- .../oak/index/indexer/document/flatfile/pipelined/ThreadMonitor.java | 2 +- .../document/incrementalstore/IncrementalFlatFileStoreStrategy.java | 2 +- .../jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java | 2 +- .../flatfile/pipelined/PipelinedMongoConnectionFailureIT.java | 2 +- .../java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java | 2 +- .../org/apache/jackrabbit/oak/exporter/NodeStateExportCommand.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java | 2 +- .../apache/jackrabbit/oak/index/IndexConsistencyCheckPrinter.java | 2 +- .../java/org/apache/jackrabbit/oak/plugins/document/check/ETA.java | 2 +- .../org/apache/jackrabbit/oak/plugins/document/check/Summary.java | 2 +- .../java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java | 2 +- .../java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java | 2 +- .../main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java | 2 +- .../apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java | 3 +-- .../oak/spi/security/authentication/AbstractLoginModule.java | 2 +- .../apache/jackrabbit/oak/segment/aws/AwsSegmentArchiveWriter.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/aws/tool/AwsCompact.java | 2 +- .../org/apache/jackrabbit/oak/segment/aws/tool/AwsSegmentCopy.java | 2 +- .../org/apache/jackrabbit/oak/segment/aws/tool/AwsToolUtils.java | 3 +-- .../jackrabbit/oak/segment/azure/AzureHttpRequestLoggingPolicy.java | 2 +- .../jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java | 2 +- .../org/apache/jackrabbit/oak/segment/azure/tool/AzureCompact.java | 2 +- .../org/apache/jackrabbit/oak/segment/azure/tool/SegmentCopy.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java | 2 +- .../jackrabbit/oak/segment/azure/v8/AzureSegmentArchiveWriterV8.java | 2 +- .../oak/segment/azure/AzureHttpRequestLoggingTestingPolicy.java | 2 +- .../oak/segment/remote/AbstractRemoteSegmentArchiveReader.java | 2 +- .../oak/segment/remote/persistentcache/PersistentDiskCache.java | 3 +-- .../oak/segment/remote/persistentcache/PersistentRedisCache.java | 2 +- .../org/apache/jackrabbit/oak/backup/impl/FileStoreBackupImpl.java | 2 +- .../org/apache/jackrabbit/oak/backup/impl/FileStoreRestoreImpl.java | 2 +- .../org/apache/jackrabbit/oak/segment/file/PrintableStopwatch.java | 2 +- .../org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java | 2 +- .../org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java | 2 +- .../spi/persistence/persistentcache/AbstractPersistentCache.java | 2 +- .../oak/segment/standby/client/StandbyClientSyncExecution.java | 2 +- .../main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java | 2 +- .../src/test/java/org/apache/jackrabbit/oak/segment/RecordTest.java | 2 +- .../org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java | 2 +- .../org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java | 2 +- .../apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java | 2 +- .../apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java | 2 +- .../jackrabbit/oak/plugins/document/JournalGarbageCollector.java | 2 +- .../apache/jackrabbit/oak/plugins/document/UnsavedModifications.java | 2 +- .../jackrabbit/oak/plugins/document/VersionGarbageCollector.java | 2 +- .../jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java | 2 +- .../apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java | 2 +- .../oak/plugins/document/secondary/SecondaryStoreObserver.java | 2 +- .../jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java | 2 +- .../org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java | 2 +- .../apache/jackrabbit/oak/plugins/document/VersionGCStatsTest.java | 2 +- .../oak/plugins/document/mongo/ReplicaSetResilienceIT.java | 2 +- .../jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java | 2 +- 96 files changed, 98 insertions(+), 100 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 fba2dd8e60..eed4265272 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 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIden import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.monitor.ExternalIdentityMonitor; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 2d456ed55a..57f193b71b 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 @@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.benchmark.util.MimeType; import org.apache.jackrabbit.oak.benchmark.util.OakIndexUtils; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.scalability.util.NodeTypeUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * The suite test will incrementally increase the load and execute searches. 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 17e9aa5976..1995c1c54c 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 @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 24b1380bd5..44b08944ea 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 @@ -24,7 +24,7 @@ import javax.jcr.Repository; import javax.jcr.Session; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * Similar to {@link RevisionGCTest} but runs continuously and performs 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 688cdb7f18..cea9dcf772 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 @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.fixture.RepositoryFixture; 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.oak.stats.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 3501c8e849..1ccdc37b03 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 @@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.standby.client.StandbyClientSync; import org.apache.jackrabbit.oak.segment.standby.jmx.StandbyStatusMBean; import org.apache.jackrabbit.oak.segment.standby.server.StandbyServerSync; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 aa160b1ed3..80a11b0b82 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 @@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.scalability.ScalabilitySuite; import org.apache.jackrabbit.oak.scalability.benchmarks.ScalabilityBenchmark; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 dc8aac6ba0..953c6e1f51 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 @@ -50,7 +50,7 @@ import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord; import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend; import org.apache.jackrabbit.oak.spi.blob.BlobOptions; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.util.LazyFileInputStream; import org.apache.jackrabbit.util.TransientFileFactory; import org.jetbrains.annotations.Nullable; 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 80fcac2ca8..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,7 +43,7 @@ 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.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 7741ae2773..8d91a6472c 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 @@ -78,7 +78,7 @@ import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 2772218593..c592fecbf1 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 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator; import org.apache.jackrabbit.oak.commons.io.FileTreeTraverser; import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/time/Stopwatch.java similarity index 96% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java rename to oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/time/Stopwatch.java index c39b6ade33..bbe8153ce1 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/stats/Stopwatch.java +++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/time/Stopwatch.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.stats; +package org.apache.jackrabbit.oak.commons.time; import org.apache.jackrabbit.oak.commons.conditions.Validate; +import java.time.Clock; import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; @@ -150,7 +151,7 @@ public class Stopwatch { return System.nanoTime(); } - private static Supplier<Long> clockAsLongSupplier(java.time.Clock clock) { + private static Supplier<Long> clockAsLongSupplier(Clock clock) { return () -> TimeUnit.MILLISECONDS.toNanos(clock.millis()); } } 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 4e6eea4322..a953f9a422 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 @@ -90,7 +90,7 @@ import org.apache.jackrabbit.oak.stats.HistogramStats; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.apache.jackrabbit.stats.TimeSeriesStatsUtil; import org.apache.jackrabbit.util.ISO8601; 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 e35a7fa423..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.oak.stats.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 7f66c68638..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 @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.index; import org.apache.jackrabbit.oak.commons.conditions.Validate; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; -import org.apache.jackrabbit.oak.stats.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/TrackingCorruptIndexHandler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java index fb5f5e1a83..c26d4a4a43 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 @@ -38,7 +38,7 @@ import javax.management.openmbean.TabularType; import org.apache.jackrabbit.guava.common.base.Throwables; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.MeterStats; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 feeb568e21..270f73530f 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 @@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 42aab15b5a..a5c0a4b131 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 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexUpdate; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.NodeTraversalCallback; import org.apache.jackrabbit.oak.spi.commit.Editor; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 0a1a868602..69b78cdf5a 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 @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.index.progress; -import org.apache.jackrabbit.oak.stats.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/property/RecursiveDelete.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java index 4839680546..fa2cc6e58b 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 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 a3e0ea2295..aac260e82a 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 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.security.user.monitor.UserMonitor; import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 a9df374faf..5f4a84d3ca 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 @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.spi.security.user.AuthorizableType; import org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider; import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 7f36e3f965..f3ee39eb2b 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 @@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.spi.xml.ProtectedNodeImporter; import org.apache.jackrabbit.oak.spi.xml.ProtectedPropertyImporter; import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker; import org.apache.jackrabbit.oak.spi.xml.TextValue; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 56c5777b1e..9e8a1a1973 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,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.junit.Test; import java.util.concurrent.TimeUnit; 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 8510f89aed..ee799ad6bc 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 @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.observation.ChangeSet; import org.apache.jackrabbit.oak.spi.observation.ChangeSetBuilder; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 ac6db67733..100752f764 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 @@ -70,7 +70,7 @@ import org.apache.jackrabbit.oak.plugins.index.search.util.NodeStateCloner; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; 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 effd1cde90..f9154fc5d4 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 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.plugins.tree.factories.RootFactory; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.store.Directory; 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 d1a9d69e5b..a759d60fdc 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 @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.MeterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 62e06c59ec..2789947ffb 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 @@ -22,7 +22,7 @@ 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; import org.apache.jackrabbit.oak.spi.query.Filter; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetResult; import org.apache.lucene.facet.FacetsCollector; 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 512ac76fad..9d2af45ed4 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 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; 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 b0b019e9bc..02212ba38b 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 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.io.Closeable; import java.io.File; 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 2b5fd568e0..095f3a6f92 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 @@ -58,7 +58,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 6f5b6d0451..02a52312b8 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 @@ -22,7 +22,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.commons.sort.ExternalSort; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 79e4f80f8e..0a7a31dc2c 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 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreSor import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.document.mongo.TraversingRange; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 a5430c1d15..643943a820 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 @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntryTraverserF import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils; import org.apache.jackrabbit.oak.plugins.document.mongo.TraversingRange; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 e0c2853d1e..488601f67a 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 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 6dd77b9af7..27fdc0ea55 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 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.BsonBinaryReader; import org.bson.BsonDocument; import org.bson.BsonType; 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 b26853f22f..8a193106fc 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 @@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 242d72e473..2f6776d76f 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 @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.RawBsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 5e4c667bd8..2a433a013e 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 @@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper import org.apache.jackrabbit.oak.plugins.index.FormattingUtils; import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.BsonBinaryReader; import org.bson.ByteBuf; import org.bson.RawBsonDocument; 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 f9bcba55d6..d6fe79bc86 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 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexingReporter; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.filter.PathFilter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.RawBsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 903989dcd4..338a42da3c 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 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.plugins.index.MetricsFormatter; import org.apache.jackrabbit.oak.plugins.index.MetricsUtils; import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 559b7ab866..62efd9dc1e 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 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined; import org.apache.jackrabbit.oak.plugins.index.FormattingUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 ac323f31d1..2d2577cf8f 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 @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.spi.commit.EditorDiff; import org.apache.jackrabbit.oak.spi.commit.VisibleEditor; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 dd854bc50b..19e31a2b1a 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 @@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStoreHelper; import org.apache.jackrabbit.oak.plugins.document.util.Utils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.conversions.Bson; import com.mongodb.BasicDBObject; 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 786678b54e..76945b3670 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 @@ -33,7 +33,7 @@ import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.junit.Assert; import org.junit.Assume; 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 3d82a8fc26..b5eea596a1 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 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.spi.commit.SimpleCommitContext; import org.apache.jackrabbit.oak.spi.commit.ResetCommitAttributeHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 cdc87addd2..9bd7785788 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 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.run.cli.NodeStoreFixture; import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider; import org.apache.jackrabbit.oak.run.cli.Options; import org.apache.jackrabbit.oak.run.commons.Command; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class NodeStateExportCommand implements Command { public static final String NAME = "export"; 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 0f9ce2e519..df9c9e73e0 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 @@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.run.cli.Options; import org.apache.jackrabbit.oak.run.commons.Command; import org.apache.jackrabbit.oak.run.commons.LoggingInitializer; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 09b4e3a3cc..186557e244 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 @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistency import org.apache.jackrabbit.oak.plugins.index.lucene.directory.IndexConsistencyChecker.Level; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE; 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 3002f4c2ad..e125218c48 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.oak.stats.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 70312e1c1f..a61d50b3c8 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 @@ -20,7 +20,7 @@ import java.util.concurrent.BlockingQueue; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; /** 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 7d70b6c2cf..268699c258 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 @@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.jackrabbit.oak.plugins.blob.datastore.TextWriter; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Term; 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 815f13c166..238c625fac 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 @@ -76,7 +76,7 @@ import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; /** 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 83cf843337..92e4a26196 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 @@ -78,7 +78,7 @@ import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 66f7d52dcd..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.Supplier; import org.apache.jackrabbit.guava.common.base.Throwables; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 78619ff928..fbdea0c8d3 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 @@ -54,7 +54,7 @@ import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 5bc1a72bf5..d86c1ce2c7 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 @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWrit import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class AwsSegmentArchiveWriter extends 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 992adc0ecc..dc6d0a2551 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 @@ -43,7 +43,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.tool.Compact; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * Perform an offline compaction of an existing AWS Segment Store. 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 2dcf2fb700..a2fcbb0b87 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 @@ -30,7 +30,7 @@ import java.io.PrintWriter; 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; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * Perform a full-copy of repository data at segment level. 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 e771be4488..76bfc7b92d 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,7 +24,6 @@ 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; @@ -38,7 +37,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; /** * Utility class for common stuff pertaining to tooling. 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 5045d29dae..2944bc9df1 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 @@ -24,7 +24,7 @@ import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; -import org.apache.jackrabbit.oak.stats.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-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 05dfe9fcf2..a8e804fd4f 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 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.remote.WriteAccessController; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.io.File; import java.io.IOException; 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 0e43f2659e..17c13b209a 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 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.spi.persistence.split.SplitPersistence; import org.apache.jackrabbit.oak.segment.tool.Compact; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.io.IOException; import java.io.PrintStream; 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 656b79e5d4..7038f46824 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 @@ -54,7 +54,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; 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.oak.stats.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 dcfdd0cc0a..79d1faeb45 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 @@ -57,7 +57,7 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache.Persist import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 740af88cf0..bd7eae218c 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 @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.segment.remote.AbstractRemoteSegmentArchiveWrit import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; public class AzureSegmentArchiveWriterV8 extends AbstractRemoteSegmentArchiveWriter { 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 8d5caec2f4..b7d0875919 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 @@ -23,7 +23,7 @@ import com.azure.core.http.HttpPipelineNextPolicy; import com.azure.core.http.HttpResponse; import com.azure.core.http.policy.HttpPipelinePolicy; -import org.apache.jackrabbit.oak.stats.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 0b85d44ba8..d0997a79d6 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 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.io.File; import java.io.IOException; 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 fb47053537..cc970cea0a 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 @@ -21,10 +21,9 @@ 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.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 51499ce8f6..daa9251e3e 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 @@ -21,7 +21,7 @@ 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.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 3b81395ba3..fc8c2c485a 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 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; import org.apache.jackrabbit.oak.segment.file.tooling.BasicReadOnlyBlobStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 02f4bbb23d..88410f8bc3 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 @@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 960d39ec0e..08dead73b6 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 @@ -17,7 +17,7 @@ */ package org.apache.jackrabbit.oak.segment.file; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import java.util.concurrent.TimeUnit; 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 313910526a..26c8d5ed24 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 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 cbc853152c..f6dab8a843 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 @@ -41,7 +41,7 @@ import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 c55373abc4..39c31c25cd 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 @@ -23,7 +23,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 980cd5d498..bff473514a 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 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.segment.SegmentNodeBuilder; import org.apache.jackrabbit.oak.segment.SegmentNodeState; import org.apache.jackrabbit.oak.segment.SegmentNotFoundException; import org.apache.jackrabbit.oak.segment.file.FileStore; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 798fce55a1..fd20aa953e 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 @@ -44,7 +44,7 @@ import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.JournalReader; import org.apache.jackrabbit.oak.segment.file.tar.LocalJournalFile; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; /** 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 b47bbbcbea..7e4fc2386b 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 @@ -47,7 +47,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.junit.After; import org.junit.Before; import org.junit.Rule; 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 9414633d04..59b1339d82 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 @@ -67,7 +67,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.After; import org.junit.Rule; 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 5d51351faa..35733d3939 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 @@ -44,7 +44,7 @@ import org.apache.jackrabbit.oak.commons.UUIDUtils; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.spi.lease.LeaseFailureHandler; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 5257821476..47acb87b5f 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 @@ -129,7 +129,7 @@ import org.apache.jackrabbit.oak.spi.toggle.Feature; import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 9556cf73e3..c5d41eb73a 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 @@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.apache.jackrabbit.oak.plugins.document.util.Utils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 376e31780a..76762f2e7a 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 @@ -23,7 +23,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.plugins.document.util.Utils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 15e11c61e6..f7ef586f80 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 @@ -31,7 +31,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.MapFactory; import org.apache.jackrabbit.oak.plugins.document.util.Utils; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 8be7e93a19..8178e03f11 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 @@ -58,7 +58,7 @@ import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.TimeDurationFormatter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; 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 b9cc9fa428..ef5ed7af38 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 @@ -89,7 +89,7 @@ import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.commons.PerfLogger; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.bson.BSONException; import org.bson.BsonMaximumSizeExceededException; import org.bson.conversions.Bson; 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 91a841b133..f6ec608edd 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 @@ -85,7 +85,7 @@ import org.apache.jackrabbit.oak.plugins.document.locks.NodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.CloseableIterator; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; 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 ec1be11f08..2058374ddc 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 @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.apache.jackrabbit.oak.stats.StatsOptions; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.stats.TimerStats; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; 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 3ccccb52a4..faba822bad 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.oak.stats.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 632af80d6b..3c30394879 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 @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.Rule; import org.junit.Test; 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 e5f75ae487..e12e6b96ef 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 @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.junit.Before; import org.junit.Test; 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 3a90715351..569ac33bc9 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 @@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.plugins.document.MongoUtils; import org.apache.jackrabbit.oak.plugins.document.TestUtils; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; 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 dd407ea0bc..c6b71870ec 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 @@ -52,7 +52,7 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.Clock; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.jetbrains.annotations.Nullable; import org.junit.AfterClass; import org.junit.Before; 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 5ff9b1a00a..1f986014ee 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 @@ -87,7 +87,7 @@ import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider; import org.apache.jackrabbit.oak.plugins.migration.FilteringNodeState; -import org.apache.jackrabbit.oak.stats.Stopwatch; +import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.upgrade.nodestate.NameFilteringNodeState; import org.apache.jackrabbit.oak.plugins.migration.NodeStateCopier; import org.apache.jackrabbit.oak.plugins.migration.report.LoggingReporter;
