This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11546 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7ca7043daeec73daa3ca5b6e98a3d7518ca5cb0a Author: Julian Reschke <[email protected]> AuthorDate: Fri Mar 14 09:57:47 2025 +0100 OAK-11546: Remove usage of Guava io.Closer --- .../test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java | 2 +- .../org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java | 2 +- .../apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java | 2 +- .../jackrabbit/oak/plugins/blob/ConsolidatedDataStoreStatsTest.java | 2 +- .../test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java | 2 +- .../org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java | 2 +- .../apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java | 2 +- oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java | 2 +- .../org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java | 2 +- .../jackrabbit/oak/security/internal/SecurityProviderRegistration.java | 2 +- .../org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java | 2 +- .../jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java | 2 +- .../src/test/java/org/apache/jackrabbit/oak/query/AbstractJcrTest.java | 2 +- .../oak/plugins/index/lucene/directory/IndexConsistencyChecker.java | 2 +- .../oak/plugins/index/lucene/directory/LuceneIndexDumper.java | 2 +- .../oak/plugins/index/lucene/directory/LuceneIndexImporter.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java | 2 +- .../apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/IndexCopierCleanupTest.java | 2 +- .../org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java | 2 +- .../jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java | 2 +- .../oak/plugins/index/lucene/directory/CopyOnWriteDirectoryTest.java | 2 +- .../oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java | 2 +- .../main/java/org/apache/jackrabbit/oak/index/OutOfBandIndexerBase.java | 2 +- .../java/org/apache/jackrabbit/oak/index/async/AsyncIndexerBase.java | 2 +- .../jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java | 2 +- .../jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java | 2 +- .../jackrabbit/oak/index/indexer/document/flatfile/FlatFileStore.java | 2 +- .../org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java | 2 +- .../org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java | 2 +- .../java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java | 2 +- .../org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java | 2 +- .../java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java | 2 +- .../org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java | 2 +- .../main/java/org/apache/jackrabbit/oak/index/ElasticIndexCommand.java | 2 +- .../org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java | 2 +- .../java/org/apache/jackrabbit/oak/index/async/AsyncIndexerElastic.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java | 2 +- .../org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java | 2 +- oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexCommand.java | 2 +- .../java/org/apache/jackrabbit/oak/index/async/AsyncIndexerLucene.java | 2 +- .../jackrabbit/oak/plugins/document/check/DocumentStoreCheck.java | 2 +- .../jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java | 2 +- .../java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java | 2 +- .../java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java | 2 +- .../main/java/org/apache/jackrabbit/oak/plugins/tika/TextPopulator.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java | 2 +- .../main/java/org/apache/jackrabbit/oak/run/ClusterNodesCommand.java | 2 +- .../main/java/org/apache/jackrabbit/oak/run/CreateGarbageCommand.java | 2 +- .../main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java | 2 +- .../java/org/apache/jackrabbit/oak/run/DocumentStoreCheckCommand.java | 2 +- .../org/apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java | 2 +- .../org/apache/jackrabbit/oak/run/FrozenNodeRefsUsingIndexCommand.java | 2 +- oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java | 2 +- .../apache/jackrabbit/oak/run/GenerateVersionInconsistencyReport.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java | 2 +- oak-run/src/main/java/org/apache/jackrabbit/oak/run/RepairCommand.java | 2 +- .../main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java | 2 +- oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java | 2 +- .../jackrabbit/oak/plugins/document/CreateGarbageCommandTest.java | 2 +- .../java/org/apache/jackrabbit/oak/run/FrozenNodeReferenceCreator.java | 2 +- .../segment/remote/persistentcache/RemotePersistentCacheService.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java | 2 +- .../org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java | 2 +- .../jackrabbit/oak/segment/standby/store/StandbyStoreService.java | 2 +- oak-shaded-guava/pom.xml | 1 + .../org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java | 2 +- .../jackrabbit/oak/plugins/document/DocumentNodeStoreService.java | 2 +- .../apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java | 2 +- .../src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java | 2 +- .../apache/jackrabbit/oak/upgrade/cli/blob/AzureDataStoreFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/blob/BlobStoreFactory.java | 2 +- .../jackrabbit/oak/upgrade/cli/blob/ConstantBlobStoreFactory.java | 2 +- .../apache/jackrabbit/oak/upgrade/cli/blob/DummyBlobStoreFactory.java | 2 +- .../apache/jackrabbit/oak/upgrade/cli/blob/FileBlobStoreFactory.java | 2 +- .../apache/jackrabbit/oak/upgrade/cli/blob/FileDataStoreFactory.java | 2 +- .../jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/cli/node/MongoFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/node/NodeStoreFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java | 2 +- .../org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java | 2 +- .../java/org/apache/jackrabbit/oak/upgrade/cli/node/StoreFactory.java | 2 +- .../jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactoryTest.java | 2 +- .../jackrabbit/oak/upgrade/cli/container/AzureDataStoreContainer.java | 2 +- .../jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java | 2 +- .../jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java | 2 +- .../jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java | 2 +- .../jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java | 2 +- .../apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactoryTest.java | 2 +- 102 files changed, 102 insertions(+), 101 deletions(-) diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java index 5008646443..a503935c51 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java @@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicReference; import ch.qos.logback.classic.Level; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java index ba5617ea6a..a944c391b7 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java index d6d71041da..fcd259be16 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.jackrabbit.guava.common.util.concurrent.SettableFuture; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreStatsTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreStatsTest.java index 26469b4130..ca9047568a 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreStatsTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/ConsolidatedDataStoreStatsTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.NullOutputStream; import org.apache.jackrabbit.core.data.DataRecord; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java index 11eccb4132..e834bb1e71 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/FileCacheTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.Futures; import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java index 9e813ddbbc..28d4f0cc73 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicInteger; import ch.qos.logback.classic.Level; import org.apache.jackrabbit.guava.common.collect.Iterators; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.Futures; import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture; import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java index 3a496ce049..365df839d7 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java @@ -31,7 +31,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.FileIOUtils; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java index aa97a11091..3895799754 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java @@ -48,7 +48,7 @@ import javax.management.ObjectName; import javax.management.StandardMBean; import javax.security.auth.login.LoginException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.ContentRepository; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java index 0002aa5597..a56145c23d 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.index.property.jmx.PropertyIndexAsyncReindex; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java index 3c595e0448..d5cbbb6bc3 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.security.internal; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager; import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java index d3c3537e9c..4192a8afe0 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/AtomicCompositeMergeTest.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.composite; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.InitialContent; import org.apache.jackrabbit.oak.Oak; diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java index 69908e95b1..d318617320 100644 --- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java +++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java @@ -53,7 +53,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class AsyncIndexUpdateClusterTestIT { diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/query/AbstractJcrTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/query/AbstractJcrTest.java index 3a9ac9b1f1..4888e0289e 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/query/AbstractJcrTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/query/AbstractJcrTest.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.query; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.api.JackrabbitRepository; import org.junit.After; 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 7437342b31..9321c3951e 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 @@ -33,7 +33,7 @@ import javax.jcr.PropertyType; import org.apache.commons.io.input.CountingInputStream; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.api.Blob; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumper.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumper.java index 7c74af3ff7..d7dee0ebb3 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumper.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexDumper.java @@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.directory; import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java index b56b728dea..493b501acf 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/LuceneIndexImporter.java @@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.directory; import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.index.importer.IndexImporterProvider; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java index bee5756ceb..90b2e7dda0 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.reader; import java.io.IOException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.DirectoryReader; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java index d076cf5740..81d73f6b2c 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java @@ -25,7 +25,7 @@ import java.nio.file.Files; import java.util.Collections; import java.util.List; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; import org.apache.lucene.analysis.Analyzer; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java index 00823dc779..51df3e30a5 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java @@ -51,7 +51,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; class DefaultIndexWriter implements LuceneIndexWriter { private static final Logger log = LoggerFactory.getLogger(DefaultIndexWriter.class); diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierCleanupTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierCleanupTest.java index 55f6695c2e..86ab3ac0e7 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierCleanupTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierCleanupTest.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java index 6b2a40ae14..cfba7256c6 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.management.openmbean.TabularData; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.ForwardingListeningExecutorService; import org.apache.jackrabbit.guava.common.util.concurrent.Futures; import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java index 6283b1a0d6..67f0edeb7e 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ReopenedLuceneIndexTest.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.QueryEngine; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectoryTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectoryTest.java index 147d6c699b..e961f761f9 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectoryTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/CopyOnWriteDirectoryTest.java @@ -27,7 +27,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java index 68d9bc4491..325d4770bd 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/FailedIndexUpdateTest.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.writer; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java index 3912bf0359..fa3becc0b6 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java @@ -31,7 +31,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfoService; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfoServiceImpl; 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 63531ab4ef..f1cef301ee 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 @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.index; import com.codahale.metrics.MetricRegistry; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.*; import org.apache.jackrabbit.oak.plugins.index.progress.MetricRateEstimator; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerBase.java index fafd3c885f..48010bcc13 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerBase.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index.async; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.index.IndexHelper; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; 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 071ed395b6..d1af4e92c0 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 @@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.index.indexer.document; import com.codahale.metrics.MetricRegistry; import com.mongodb.MongoClientURI; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java index 2d50ce1d92..be99eab929 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.index.indexer.document; import org.apache.jackrabbit.guava.common.collect.FluentIterable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStore.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStore.java index 9650cd1fef..5a18ee01fe 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStore.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileStore.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.index.indexer.document.flatfile; import org.apache.commons.io.LineIterator; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.commons.Compression; import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry; import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStore; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java index 93dd50137d..877764f472 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.indexversion; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java index f139d45acb..5a7b7bf500 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.felix.cm.file.ConfigurationHandler; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java index 90beaeae3b..deb13e69c9 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java @@ -23,7 +23,7 @@ import java.io.IOException; import javax.sql.DataSource; import com.mongodb.client.MongoDatabase; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import com.mongodb.MongoClientURI; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java index d2e8089628..e96a75c5ab 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java @@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import com.codahale.metrics.ConsoleReporter; import com.codahale.metrics.Counting; import com.codahale.metrics.MetricRegistry; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.index.ConsoleIndexingReporter; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java index dd2ad0252d..aa4a7bdb4a 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java @@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.run.cli; import java.io.File; import java.io.IOException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java index 0528230d01..dae75cabbe 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java @@ -27,7 +27,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.azure.v8.AzureStorageCredentialManagerV8; 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 9539ffb933..376befe307 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 @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.index; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.api.CommitFailedException; diff --git a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java index bf5a6f7163..1de5cb9c32 100644 --- a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java +++ b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; diff --git a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerElastic.java b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerElastic.java index 59d14f5c04..211dc9f7a6 100644 --- a/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerElastic.java +++ b/oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerElastic.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index.async; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.index.ElasticIndexOptions; import org.apache.jackrabbit.oak.index.IndexHelper; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java index f501e1fc58..3a1e647884 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/Checkpoints.java @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.jetbrains.annotations.NotNull; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; /** * A helper class to manage checkpoints on TarMK and DocumentMK. diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java index d61317f538..0e4f04fca1 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.segment.SegmentNodeState; 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 c1800d2158..3234e105c9 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 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.index; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.felix.inventory.Format; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerLucene.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerLucene.java index 234d31aead..f3080fefca 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerLucene.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/async/AsyncIndexerLucene.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.index.async; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.index.ExtendedIndexHelper; import org.apache.jackrabbit.oak.index.LuceneIndexHelper; import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/DocumentStoreCheck.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/DocumentStoreCheck.java index d5804088b6..38400e88b9 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/DocumentStoreCheck.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/check/DocumentStoreCheck.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java index bb6b476acc..4ceb6dbf0f 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProvider.java @@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.function.Function; import org.apache.jackrabbit.guava.common.collect.FluentIterable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java index db5794df28..3cc57c8032 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import org.apache.jackrabbit.guava.common.collect.FluentIterable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.commons.csv.CSVPrinter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java index 7a07d75238..44e01e5b81 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java @@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionParser; 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 60b7970022..8d2df2e16d 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 @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.plugins.tika; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +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; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java index 5de8f70361..ac9d535f92 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java @@ -22,7 +22,7 @@ import java.sql.Timestamp; import java.util.List; import java.util.Map; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.checkpoint.Checkpoints; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ClusterNodesCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ClusterNodesCommand.java index dc9831f72f..755a77431d 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ClusterNodesCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ClusterNodesCommand.java @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJSONSupport; import org.apache.jackrabbit.oak.run.commons.Command; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionSpec; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CreateGarbageCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CreateGarbageCommand.java index 6c5409efee..81ef1955c3 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CreateGarbageCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CreateGarbageCommand.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.run; import joptsimple.OptionSpec; import org.apache.jackrabbit.JcrConstants; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder; 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 1d55c0c768..fb506131be 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 @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.jackrabbit.guava.common.base.Splitter; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java index 08f334582e..e967357a5f 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 @@ -41,7 +41,7 @@ import java.util.stream.StreamSupport; import org.apache.jackrabbit.guava.common.base.Splitter; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionParser; import org.apache.commons.io.FileUtils; import org.apache.commons.io.LineIterator; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DocumentStoreCheckCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DocumentStoreCheckCommand.java index 9c99812498..e0c17da707 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DocumentStoreCheckCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DocumentStoreCheckCommand.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.run; import java.util.List; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java index fd6b8b2aca..da5517e980 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java @@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import joptsimple.OptionParser; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsUsingIndexCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsUsingIndexCommand.java index e9b3861ec8..c855fd0a56 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsUsingIndexCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/FrozenNodeRefsUsingIndexCommand.java @@ -31,7 +31,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.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; /** * Scans and lists all references to nt:frozenNode and returns an exit code of 1 if any are found (0 otherwise). diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java index 57ebc2e330..a1201008fb 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GarbageCommand.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.run.commons.Command; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreHelper; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GenerateVersionInconsistencyReport.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GenerateVersionInconsistencyReport.java index 4baa1d6e62..9ac9cfa61e 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GenerateVersionInconsistencyReport.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/GenerateVersionInconsistencyReport.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.api.ContentSession; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java index b2f7b5d1b6..02e628af35 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RecoveryCommand.java @@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.plugins.document.util.MapFactory; import org.apache.jackrabbit.oak.run.commons.Command; import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; class RecoveryCommand implements Command { diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RepairCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RepairCommand.java index 499db94c18..027236bf05 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RepairCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RepairCommand.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.run; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.run.commons.Command; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java index 29533397a2..d372605459 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java @@ -25,7 +25,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.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; /** * OFFLINE utility to delete the clusterId stored as hidden diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java index 1bdf2ac8ba..c7f867d08e 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RevisionsCommand.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.run; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import java.io.IOException; import java.util.Arrays; diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java index dc4b55a712..9653c2ed24 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java @@ -68,7 +68,7 @@ import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import com.mongodb.MongoClientURI; import com.mongodb.MongoURI; diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/document/CreateGarbageCommandTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/document/CreateGarbageCommandTest.java index dd097514a1..34369d8cdd 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/document/CreateGarbageCommandTest.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/document/CreateGarbageCommandTest.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.run.CreateGarbageCommand; diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/FrozenNodeReferenceCreator.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/FrozenNodeReferenceCreator.java index e1e8a5deb1..c89ff23819 100644 --- a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/FrozenNodeReferenceCreator.java +++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/FrozenNodeReferenceCreator.java @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.run.cli.NodeStoreFixtureProvider; import org.apache.jackrabbit.oak.run.cli.Options; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionParser; import joptsimple.OptionSet; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java index a9fdd2988a..eb4afe57e1 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.segment.remote.persistentcache; import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.cache.CacheStats; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java index 4b0f09eae7..9444acc1b8 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java @@ -42,7 +42,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.osgi.OsgiUtil; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.segment.spi.monitor.RoleStatisticsProvider; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java index 4f52e09cc3..bb5d202baf 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java @@ -25,7 +25,7 @@ import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.RETA import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder; import static org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo.getOrCreateId; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.commons.SimpleValueFactory; import org.apache.jackrabbit.oak.api.Descriptors; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java index 3389e2d14a..ab8ab1dd96 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java @@ -36,7 +36,7 @@ import static org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions.SIZE import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.DEFAULT_MAX_FILE_SIZE; import static org.apache.jackrabbit.oak.spi.blob.osgi.SplitBlobStoreService.ONLY_STANDALONE_TARGET; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.osgi.OsgiUtil; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java index a691c97ddb..8a9b7e3090 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.UncheckedExecutionException; import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.RecordId; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java index 97b2dc7ef7..5037f172ff 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java @@ -31,7 +31,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.function.Consumer; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.UncheckedExecutionException; import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.Segment; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java index 7fbe43e92f..6b420128e0 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java @@ -23,7 +23,7 @@ import java.io.File; import java.util.Dictionary; import java.util.Hashtable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.segment.SegmentStore; import org.apache.jackrabbit.oak.segment.SegmentStoreProvider; import org.apache.jackrabbit.oak.segment.file.FileStore; diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml index a8a4a782a5..9e4f676f9a 100644 --- a/oak-shaded-guava/pom.xml +++ b/oak-shaded-guava/pom.xml @@ -65,6 +65,7 @@ <exclude>com/google/common/eventbus/**</exclude> <exclude>com/google/common/html/**</exclude> <exclude>com/google/common/net/**</exclude> + <exclude>com/google/common/io/**</exclude> <exclude>com/google/common/reflect/**</exclude> <exclude>com/google/common/xml/**</exclude> </excludes> diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java index f35ce8c4b9..32b795288d 100644 --- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java +++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.composite; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Deactivate; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index 79e4b98ea6..ae04e85cba 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -51,7 +51,7 @@ import java.util.function.Supplier; import javax.sql.DataSource; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.guava.common.util.concurrent.UncheckedExecutionException; import com.mongodb.MongoClientURI; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java index a0d76b5817..38a96ea6c0 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java @@ -23,7 +23,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.Iterator; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.jetbrains.annotations.NotNull; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java index c87fc36b6d..ee20338b8a 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java @@ -23,7 +23,7 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class CliUtils { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java index 1fc357f310..a28e7668cc 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java @@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.parser.DatastoreArguments; import org.apache.jackrabbit.oak.upgrade.cli.parser.MigrationOptions; import org.apache.jackrabbit.oak.upgrade.cli.parser.StoreArguments; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class MigrationFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java index 7f455b0b08..2020da08ca 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java @@ -22,7 +22,7 @@ import java.util.ServiceLoader; import javax.jcr.RepositoryException; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import joptsimple.OptionSet; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureDataStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureDataStoreFactory.java index 71506980e4..430ad979ec 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureDataStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/AzureDataStoreFactory.java @@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class AzureDataStoreFactory implements BlobStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/BlobStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/BlobStoreFactory.java index e8b7c6290a..1c57b670b3 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/BlobStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/BlobStoreFactory.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.apache.jackrabbit.oak.spi.blob.BlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public interface BlobStoreFactory { BlobStore create(Closer closer) throws IOException; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/ConstantBlobStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/ConstantBlobStoreFactory.java index 96f76cd20e..8386e33749 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/ConstantBlobStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/ConstantBlobStoreFactory.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.upgrade.cli.blob; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import java.io.IOException; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/DummyBlobStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/DummyBlobStoreFactory.java index dd6203928d..3bc176e46e 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/DummyBlobStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/DummyBlobStoreFactory.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.upgrade.cli.blob; import org.apache.jackrabbit.oak.spi.blob.BlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class DummyBlobStoreFactory implements BlobStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileBlobStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileBlobStoreFactory.java index 351ad2cc43..c17ea1810d 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileBlobStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileBlobStoreFactory.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.upgrade.cli.blob; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.blob.FileBlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class FileBlobStoreFactory implements BlobStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileDataStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileDataStoreFactory.java index 67b0ead40f..60c4e490a5 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileDataStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FileDataStoreFactory.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class FileDataStoreFactory implements BlobStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactory.java index 53123ab5d9..d444df134c 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactory.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.upgrade.cli.blob; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import static java.util.Objects.requireNonNull; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java index c7d332c484..7a3d8b7561 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore; import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; import org.apache.jackrabbit.oak.spi.blob.BlobStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java index c88e3a8af7..c06681a947 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/Jackrabbit2Factory.java @@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class Jackrabbit2Factory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java index fba78cee91..4c31d127bd 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java @@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import javax.sql.DataSource; import java.io.Closeable; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/MongoFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/MongoFactory.java index cee39f4f50..2ffc5b8554 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/MongoFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/MongoFactory.java @@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBu import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/NodeStoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/NodeStoreFactory.java index 5b93d89032..ddb3b51733 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/NodeStoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/NodeStoreFactory.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public interface NodeStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java index cad6c3aaff..aafebfaaad 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactory.java @@ -21,7 +21,7 @@ import com.microsoft.azure.storage.StorageCredentialsSharedAccessSignature; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.azure.v8.AzurePersistenceV8; import org.apache.jackrabbit.oak.segment.azure.v8.AzureStorageCredentialManagerV8; diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java index 5baefd9a58..54752bfb52 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class SegmentFactory implements NodeStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java index 936b4fe30d..993a2a672f 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.upgrade.cli.node.FileStoreUtils.NodeStoreWithFileStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class SegmentTarFactory implements NodeStoreFactory { diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/StoreFactory.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/StoreFactory.java index ef1a83eca7..e2196a7a3a 100644 --- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/StoreFactory.java +++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/StoreFactory.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class StoreFactory { diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactoryTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactoryTest.java index ffc4e34464..2d2551521d 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactoryTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/LoopbackBlobStoreFactoryTest.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.upgrade.cli.blob; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.junit.Test; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/AzureDataStoreContainer.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/AzureDataStoreContainer.java index 3567d9f2bc..88a89ea946 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/AzureDataStoreContainer.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/AzureDataStoreContainer.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.blob.AzureDataStoreFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; public class AzureDataStoreContainer implements BlobStoreContainer { diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java index b66930258f..10b9beced6 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java @@ -25,7 +25,7 @@ import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.upgrade.cli.blob.FileDataStoreFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import static org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer.deleteRecursive; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java index e81fe6997f..8ddb97cfb9 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.node.JdbcFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import static org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer.deleteRecursive; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java index 2475e6516b..539fd0741b 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/MongoNodeStoreContainer.java @@ -25,7 +25,7 @@ import org.junit.Assume; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import com.mongodb.Mongo; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java index 533b510d98..c9753369db 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.upgrade.cli.blob.S3DataStoreFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import static org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer.deleteRecursive; diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactoryTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactoryTest.java index 691411c011..bd88cf6017 100644 --- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactoryTest.java +++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentAzureFactoryTest.java @@ -23,7 +23,7 @@ import com.microsoft.azure.storage.SharedAccessAccountResourceType; import com.microsoft.azure.storage.SharedAccessAccountService; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.guava.common.io.Closer; +import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzuriteDockerRule; import org.apache.jackrabbit.oak.segment.azure.v8.AzureStorageCredentialManagerV8; import org.apache.jackrabbit.oak.segment.azure.v8.AzureUtilitiesV8;
