This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11918 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 06583c6501bd8d38e075dfbe6365c1fe5f351a1a Author: rishabhdaim <[email protected]> AuthorDate: Mon Dec 1 21:50:08 2025 +0530 OAK-11918 : removed Guava's ListeningExecutorService --- .../oak/plugins/blob/AbstractSharedCachingDataStore.java | 6 ++---- .../jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java | 4 +--- .../jackrabbit/oak/commons/jmx/ManagementOperationTest.java | 9 ++++----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java index 0c83d5b368..569f45cd71 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java @@ -58,8 +58,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; - /** * Cache files locally and stage files locally for async uploads. * Configuration: @@ -137,7 +135,7 @@ public abstract class AbstractSharedCachingDataStore extends AbstractDataStore */ protected AbstractSharedBackend backend; - protected ListeningExecutorService listeningExecutor; + protected ExecutorService executorService; protected ScheduledExecutorService schedulerExecutor; @@ -174,7 +172,7 @@ public abstract class AbstractSharedCachingDataStore extends AbstractDataStore @Override public void adopt(File f, File moved) throws IOException { FileUtils.moveFile(f, moved); } - }, statisticsProvider, listeningExecutor, schedulerExecutor, executor, stagingPurgeInterval, + }, statisticsProvider, executorService, schedulerExecutor, executor, stagingPurgeInterval, stagingRetryInterval); } diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java index 318940dc60..a0835109a1 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java @@ -35,8 +35,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; - /** */ public class CompositeDataStoreCache extends AbstractCache<String, File> implements Closeable { @@ -62,7 +60,7 @@ public class CompositeDataStoreCache extends AbstractCache<String, File> impleme public CompositeDataStoreCache(String path, File home, long size, int uploadSplitPercentage, int uploadThreads, CacheLoader<String, InputStream> loader, final StagingUploader uploader, - StatisticsProvider statsProvider, ListeningExecutorService listeningExecutor, + StatisticsProvider statsProvider, ExecutorService listeningExecutor, ScheduledExecutorService scheduledExecutor /* purge scheduled executor */, ExecutorService executor /* File cache executor */, int purgeInterval /* async purge interval secs */, diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java index 58000fb1d3..b62cc0b876 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/commons/jmx/ManagementOperationTest.java @@ -21,9 +21,7 @@ package org.apache.jackrabbit.oak.commons.jmx; import static java.lang.Thread.currentThread; import static java.lang.Thread.sleep; -import static java.util.concurrent.Executors.newCachedThreadPool; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors.listeningDecorator; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.FAILED; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.RUNNING; import static org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean.StatusCode.SUCCEEDED; @@ -34,12 +32,13 @@ import static org.junit.Assert.fail; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeoutException; import javax.management.openmbean.CompositeData; -import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils; import org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status; import org.junit.After; @@ -47,11 +46,11 @@ import org.junit.Before; import org.junit.Test; public class ManagementOperationTest { - private ListeningExecutorService executor; + private ExecutorService executor; @Before public void setup() { - executor = listeningDecorator(newCachedThreadPool()); + executor = Executors.newCachedThreadPool(); } @After
