This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11920 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit dd354deeb60f09f9d7d7aaca70dca3c74c9abc7c Author: rishabhdaim <[email protected]> AuthorDate: Tue Nov 25 14:22:10 2025 +0530 OAK-11920 : removed usage of MoreExecutors.newDirectExecutorService with oak-commons implementation --- .../apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java | 4 ++-- .../jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java | 4 ++-- .../index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java | 6 +++--- .../index/lucene/directory/AbstractActiveDeletedBlobTest.java | 4 ++-- .../index/lucene/directory/ActiveDeletedBlobCollectorTest.java | 8 ++++---- .../plugins/index/lucene/hybrid/ExternalIndexObserverTest.java | 6 +++--- .../jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java | 5 ++--- .../jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java | 5 ++--- .../jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java | 4 ++-- 9 files changed, 22 insertions(+), 24 deletions(-) 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 6e27907891..c8dd011a0a 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 @@ -40,6 +40,7 @@ import org.apache.jackrabbit.core.data.DataRecord; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend; import org.apache.jackrabbit.oak.spi.blob.BlobOptions; @@ -55,7 +56,6 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.apache.commons.codec.binary.Hex.encodeHexString; import static org.apache.jackrabbit.oak.spi.blob.BlobOptions.UploadType.SYNCHRONOUS; import static org.junit.Assert.assertEquals; @@ -132,7 +132,7 @@ public class CachingDataStoreTest extends AbstractDataStoreCacheTest { dataStore.setStagingSplitPercentage(uploadSplit); dataStore.listeningExecutor = listeningExecutor; dataStore.schedulerExecutor = scheduledExecutor; - dataStore.executor = newDirectExecutorService(); + dataStore.executor = ExecutorUtils.newDirectExecutorService(); dsPath = new File(root.getAbsolutePath(), "ds").getAbsolutePath(); dataStore.setPath(dsPath); dataStore.init(root.getAbsolutePath()); 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 eb34beb3b9..2016b23a4d 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 @@ -34,6 +34,7 @@ import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorServi import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -46,7 +47,6 @@ import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -102,7 +102,7 @@ public class CompositeDataStoreCacheTest extends AbstractDataStoreCacheTest { scheduledExecutor = Executors.newSingleThreadScheduledExecutor(); closer.register(new ExecutorCloser(scheduledExecutor, 500, TimeUnit.MILLISECONDS)); - fileCacheExecutor = newDirectExecutorService(); + fileCacheExecutor = ExecutorUtils.newDirectExecutorService(); //cache instance cache = diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java index 5aa327c375..b429f851ac 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java @@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.internal.concurrent.DirectExecutor; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider; import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore; @@ -74,7 +75,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import static org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_DONE; import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_RUNNING; import static org.apache.jackrabbit.oak.plugins.index.IndexCommitCallback.IndexProgress.COMMIT_SUCCEDED; @@ -496,7 +496,7 @@ public class ActiveDeletedBlobCollectorMBeanImplTest { private final ActiveDeletedBlobCollector delegate; DeletedFileTrackingADBC(File tempFolder) { - delegate = ActiveDeletedBlobCollectorFactory.newInstance(tempFolder, newDirectExecutorService()); + delegate = ActiveDeletedBlobCollectorFactory.newInstance(tempFolder, ExecutorUtils.newDirectExecutorService()); } @Override @@ -577,7 +577,7 @@ public class ActiveDeletedBlobCollectorMBeanImplTest { ActiveDeletedBlobCollectorMBeanImpl bean = new ActiveDeletedBlobCollectorMBeanImpl(ActiveDeletedBlobCollectorFactory.NOOP, wb, nodeStore, indexPathService, asyncIndexInfoService, - new MemoryBlobStore(), newDirectExecutorService()); + new MemoryBlobStore(), ExecutorUtils.directExecutor()); bean.clock = clock; return bean; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java index a32fb06986..96fc74f107 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; -import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.core.data.DataIdentifier; import org.apache.jackrabbit.core.data.DataRecord; @@ -35,6 +34,7 @@ import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.plugins.blob.BlobTrackingStore; import org.apache.jackrabbit.oak.plugins.blob.datastore.BlobTracker; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate; @@ -70,7 +70,7 @@ public abstract class AbstractActiveDeletedBlobTest extends AbstractQueryTest { @Rule public TemporaryFolder fileDataStoreRoot = new TemporaryFolder(new File("target")); - protected ExecutorService executorService = MoreExecutors.newDirectExecutorService(); + protected ExecutorService executorService = ExecutorUtils.newDirectExecutorService(); protected CountingBlobStore blobStore = null; diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java index 7493966362..324fde77c7 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.index.lucene.directory; -import static org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.apache.jackrabbit.oak.plugins.index.IndexCommitCallback.IndexProgress.COMMIT_FAILED; import static org.apache.jackrabbit.oak.plugins.index.IndexCommitCallback.IndexProgress.COMMIT_SUCCEDED; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -51,6 +50,7 @@ import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.testing.CIHelper; import org.apache.jackrabbit.oak.commons.collections.ListUtils; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.commons.junit.LogCustomizer; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.ActiveDeletedBlobCollectorFactory.ActiveDeletedBlobCollector; import org.apache.jackrabbit.oak.plugins.index.lucene.directory.ActiveDeletedBlobCollectorFactory.ActiveDeletedBlobCollectorImpl; @@ -82,7 +82,7 @@ public class ActiveDeletedBlobCollectorTest { private void createBlobCollector() { adbc = new ActiveDeletedBlobCollectorImpl(clock, - new File(blobCollectionRoot.getRoot(), "/a"), newDirectExecutorService()); + new File(blobCollectionRoot.getRoot(), "/a"), ExecutorUtils.newDirectExecutorService()); } @Test @@ -280,11 +280,11 @@ public class ActiveDeletedBlobCollectorTest { PosixFilePermission.GROUP_READ, PosixFilePermission.OTHERS_READ)); - adbc = ActiveDeletedBlobCollectorFactory.newInstance(unwritableExistingRootFolder, newDirectExecutorService()); + adbc = ActiveDeletedBlobCollectorFactory.newInstance(unwritableExistingRootFolder, ExecutorUtils.newDirectExecutorService()); assertEquals("Unwritable existing root folder must have NOOP active blob collector", ActiveDeletedBlobCollectorFactory.NOOP, adbc); - adbc = ActiveDeletedBlobCollectorFactory.newInstance(unwritableNonExistingRootFolder, newDirectExecutorService()); + adbc = ActiveDeletedBlobCollectorFactory.newInstance(unwritableNonExistingRootFolder, ExecutorUtils.newDirectExecutorService()); assertEquals("Unwritable non-existing root folder must have NOOP active blob collector", ActiveDeletedBlobCollectorFactory.NOOP, adbc); } diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java index 348556785d..be16ca49bd 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserverTest.java @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.HashSetValuedHashMap; -import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexDefinitionBuilder; @@ -175,7 +175,7 @@ public class ExternalIndexObserverTest { @Test public void builder() throws Exception{ ExternalObserverBuilder builder = - new ExternalObserverBuilder(queue, tracker,NOOP, MoreExecutors.newDirectExecutorService(), 10); + new ExternalObserverBuilder(queue, tracker,NOOP, ExecutorUtils.directExecutor(), 10); Observer o = builder.build(); o.contentChanged(INITIAL_CONTENT, CommitInfo.EMPTY_EXTERNAL); verifyNoInteractions(queue); @@ -184,7 +184,7 @@ public class ExternalIndexObserverTest { @Test public void builder_NonFiltered() throws Exception{ ExternalObserverBuilder builder = - new ExternalObserverBuilder(queue, tracker,NOOP, MoreExecutors.newDirectExecutorService(), 10); + new ExternalObserverBuilder(queue, tracker,NOOP, ExecutorUtils.directExecutor(), 10); assertIndexing(builder.build()); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index 2099d524fb..bb5f34c5ba 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -46,6 +46,7 @@ import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.EmpiricalWeigher; import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.commons.internal.function.Suppliers; import org.apache.jackrabbit.oak.plugins.blob.BlobStoreStats; import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore; @@ -73,8 +74,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; - /** * A generic builder for a {@link DocumentNodeStore}. By default the builder * will create an in-memory {@link DocumentNodeStore}. In most cases this is @@ -746,7 +745,7 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> { public Executor getExecutor() { if (executor == null){ - return MoreExecutors.newDirectExecutorService(); + return ExecutorUtils.directExecutor(); } return executor; } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java index 0ecef36181..de5db70139 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java @@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; - +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; @@ -72,7 +71,7 @@ public class PrefetchDispatcherTest { DocumentNodeState after = ns2.getRoot().fromExternalChange(); PrefetchDispatcher dispatcher = new PrefetchDispatcher( - before, MoreExecutors.newDirectExecutorService()); + before, ExecutorUtils.directExecutor()); numQueries.set(0); dispatcher.contentChanged(after, CommitInfo.EMPTY_EXTERNAL); // expect two queries for children: below /foo and /foo/bar diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java index 838f9e6955..f3938cedcb 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java @@ -29,11 +29,11 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors; import org.apache.jackrabbit.core.data.DataStore; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.commons.collections.ListUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; +import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.plugins.blob.BlobGarbageCollector; import org.apache.jackrabbit.oak.plugins.blob.GarbageCollectionRepoStats; import org.apache.jackrabbit.oak.plugins.blob.MarkSweepGarbageCollector; @@ -339,7 +339,7 @@ public class SharedBlobStoreGCTest { this.gc = new MarkSweepGarbageCollector( new DocumentBlobReferenceRetriever(ds), (GarbageCollectableBlobStore) ds.getBlobStore(), - MoreExecutors.newDirectExecutorService(), + ExecutorUtils.directExecutor(), "./target", 5, 0, repoId); this.startDate = new Date(); this.seed = seed;
