This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11762 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 4b3152f365acc1e91eccabe9783b2ef079aa88fb Author: Rishabh Kumar <[email protected]> AuthorDate: Fri Jun 13 17:12:12 2025 +0530 OAK-11762 : replaced Throwables.getStackTraceAsString with commons-lang3 --- .../apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 4 ++-- .../oak/plugins/index/TrackingCorruptIndexHandler.java | 4 ++-- oak-search/pom.xml | 9 ++++----- .../jackrabbit/oak/plugins/index/search/BadIndexTracker.java | 6 +++--- .../jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java | 3 ++- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java index ef273a1812..4ef79bd8f1 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java @@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.plugins.index; import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument; import static java.util.Objects.requireNonNull; -import static org.apache.jackrabbit.guava.common.base.Throwables.getStackTraceAsString; import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_DONE; import static org.apache.jackrabbit.oak.commons.PathUtils.elements; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_PROPERTY_NAME; @@ -50,6 +49,7 @@ import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; import com.codahale.metrics.MetricRegistry; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.jackrabbit.api.stats.TimeSeries; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -1085,7 +1085,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable { return; } - latestError = getStackTraceAsString(e); + latestError = ExceptionUtils.getStackTrace(e); latestErrorTime = now(); consecutiveFailures++; if (!failing) { diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java index 41795f6a4e..350a82f926 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java @@ -35,8 +35,8 @@ import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.jackrabbit.oak.commons.time.Stopwatch; -import org.apache.jackrabbit.guava.common.base.Throwables; import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.stats.MeterStats; import org.slf4j.Logger; @@ -181,7 +181,7 @@ public class TrackingCorruptIndexHandler implements CorruptIndexHandler { } void addFailure(Exception e){ - exception = Throwables.getStackTraceAsString(e); + exception = ExceptionUtils.getStackTrace(e); failureCount++; } diff --git a/oak-search/pom.xml b/oak-search/pom.xml index 459d5c0596..2686e154d1 100644 --- a/oak-search/pom.xml +++ b/oak-search/pom.xml @@ -125,6 +125,10 @@ <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> <!-- Test Dependencies --> <dependency> @@ -132,11 +136,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java index e8648087ff..ac5eea06ec 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/BadIndexTracker.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.base.Throwables; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,7 +164,7 @@ public class BadIndexTracker { public BadIndexInfo(String path, Throwable e, boolean persistedIndex) { this.path = path; - this.exception = Throwables.getStackTraceAsString(e); + this.exception = ExceptionUtils.getStackTrace(e); this.persistedIndex = persistedIndex; } @@ -213,7 +213,7 @@ public class BadIndexTracker { public void failedAccess(Throwable e) { failedAccessCount++; - exception = Throwables.getStackTraceAsString(e); + exception = ExceptionUtils.getStackTrace(e); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java index 514f0af2d2..3b78a0dec4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java @@ -94,6 +94,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.jcr.InvalidItemStateException; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.jackrabbit.guava.common.base.Throwables; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -2130,7 +2131,7 @@ public class DocumentNodeStoreTest { StringBuffer message = new StringBuffer(assertMessage); if (cfe != null) { message.append("\n"); - message.append(Throwables.getStackTraceAsString(cfe)); + message.append(ExceptionUtils.getStackTrace(cfe)); } fail(message.toString()); }
