This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new c45b4694d7 OAK-12020 : replaced Guava's
MoreExecutors.getExitingScheduledExecutorService with oak-commons
implementation (#2633)
c45b4694d7 is described below
commit c45b4694d7e2c36ffd5f88325aacabcbdb3559ef
Author: Rishabh Kumar <[email protected]>
AuthorDate: Sat Nov 29 00:22:37 2025 +0530
OAK-12020 : replaced Guava's
MoreExecutors.getExitingScheduledExecutorService with oak-commons
implementation (#2633)
---
.../java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java | 4 ++--
.../java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java | 4 ++--
.../org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java | 4 ++--
.../apache/jackrabbit/oak/run/FrozenNodeRefsByScanningCommand.java | 5 ++---
.../main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java | 4 ++--
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
index 7449cec314..f7de6c3b6a 100644
---
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
+++
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
@@ -22,7 +22,6 @@ import com.codahale.metrics.Counting;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
-import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import org.apache.commons.io.FileUtils;
@@ -48,6 +47,7 @@ import
org.apache.jackrabbit.oak.benchmark.authorization.principalbased.HasItemG
import
org.apache.jackrabbit.oak.benchmark.authorization.principalbased.PermissionEvaluationTest;
import
org.apache.jackrabbit.oak.benchmark.authorization.principalbased.PrinicipalBasedReadTest;
import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
+import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils;
import org.apache.jackrabbit.oak.fixture.JackrabbitRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.OakFixture;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
@@ -577,7 +577,7 @@ public class BenchmarkRunner {
protected static StatisticsProvider getStatsProvider() {
if (statsProvider == null) {
- ScheduledExecutorService executorService =
MoreExecutors.getExitingScheduledExecutorService(
+ ScheduledExecutorService executorService =
ExecutorUtils.getExitingScheduledExecutorService(
(ScheduledThreadPoolExecutor)
Executors.newScheduledThreadPool(1));
return new MetricStatisticsProvider(null, executorService);
diff --git
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
index 7f4a16c7cd..cbaccc15e1 100644
---
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
+++
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadPropertyTest.java
@@ -30,8 +30,8 @@ import javax.management.MBeanServer;
import com.codahale.metrics.Metric;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.Slf4jReporter;
-import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils;
import org.apache.jackrabbit.oak.fixture.JcrCreator;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
@@ -88,7 +88,7 @@ public class ReadPropertyTest extends AbstractTest {
log.info("Enabling Metrics integration");
MBeanServer server =
ManagementFactory.getPlatformMBeanServer();
ScheduledExecutorService executor =
-
MoreExecutors.getExitingScheduledExecutorService(new
ScheduledThreadPoolExecutor(1));
+
ExecutorUtils.getExitingScheduledExecutorService(new
ScheduledThreadPoolExecutor(1));
MetricStatisticsProvider statsProvider = new
MetricStatisticsProvider(server, executor);
oak.getWhiteboard().register(StatisticsProvider.class,
statsProvider, Collections.emptyMap());
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 710ccc9a59..656037d1f5 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,8 +28,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.Counting;
import com.codahale.metrics.MetricRegistry;
+import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils;
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;
import org.apache.jackrabbit.oak.plugins.index.IndexingReporter;
@@ -102,7 +102,7 @@ public class NodeStoreFixtureProvider {
public static StatisticsProvider createStatsProvider(Whiteboard wb, Closer
closer) {
ScheduledExecutorService executorService =
- MoreExecutors.getExitingScheduledExecutorService(new
ScheduledThreadPoolExecutor(1));
+ ExecutorUtils.getExitingScheduledExecutorService(new
ScheduledThreadPoolExecutor(1));
MetricStatisticsProvider statsProvider = new
MetricStatisticsProvider(getPlatformMBeanServer(), executorService);
closer.register(statsProvider);
closer.register(() -> reportMetrics(statsProvider));
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 ff748921ec..c3baa3f21c 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
@@ -41,6 +41,7 @@ import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils;
import org.apache.jackrabbit.oak.commons.pio.Closer;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
@@ -57,8 +58,6 @@ 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.util.concurrent.MoreExecutors;
-
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
@@ -244,7 +243,7 @@ public class FrozenNodeRefsByScanningCommand implements
Command {
// from JsonIndexCommand, unmodified
private static LuceneIndexEditorProvider createLuceneIndexEditorProvider()
{
LuceneIndexEditorProvider ep = new LuceneIndexEditorProvider();
- ScheduledExecutorService executorService = MoreExecutors
+ ScheduledExecutorService executorService = ExecutorUtils
.getExitingScheduledExecutorService((ScheduledThreadPoolExecutor)
Executors.newScheduledThreadPool(5));
StatisticsProvider statsProvider = StatisticsProvider.NOOP;
int queueSize = Integer.getInteger("queueSize", 1000);
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java
index 524e9aec1a..9561b2695b 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java
@@ -51,13 +51,13 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
-import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorUtils;
import org.apache.jackrabbit.oak.commons.json.JsonObject;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
@@ -497,7 +497,7 @@ public class JsonIndexCommand implements Command {
private static LuceneIndexEditorProvider createLuceneIndexEditorProvider()
{
LuceneIndexEditorProvider ep = new LuceneIndexEditorProvider();
- ScheduledExecutorService executorService =
MoreExecutors.getExitingScheduledExecutorService(
+ ScheduledExecutorService executorService =
ExecutorUtils.getExitingScheduledExecutorService(
(ScheduledThreadPoolExecutor)
Executors.newScheduledThreadPool(5));
StatisticsProvider statsProvider = StatisticsProvider.NOOP;
int queueSize = Integer.getInteger("queueSize", 1000);
