This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11748 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1399f9e57b75dfe4b00fc36b0de67d64592bfca1 Author: Julian Reschke <[email protected]> AuthorDate: Fri Jun 6 16:04:16 2025 +0100 OAK-11748: Remove usage of Guava Escapers --- oak-parent/pom.xml | 5 +++++ .../java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java | 6 ++---- oak-segment-tar/pom.xml | 5 +++++ .../java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java | 9 ++------- oak-shaded-guava/pom.xml | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 42d39fc5d8..23d8344ecb 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -596,6 +596,11 @@ <artifactId>commons-lang3</artifactId> <version>3.17.0</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>1.13.1</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java index 2bf16e7ecb..eec041f249 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.explorer; -import static org.apache.jackrabbit.guava.common.escape.Escapers.builder; import static java.util.Collections.sort; import static javax.jcr.PropertyType.BINARY; import static javax.jcr.PropertyType.STRING; @@ -52,6 +51,7 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; +import org.apache.commons.text.StringEscapeUtils; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -373,9 +373,7 @@ class NodeStoreTree extends JPanel implements TreeSelectionListener, Closeable { value = value.substring(0, MAX_CHAR_DISPLAY) + "... (" + value.length() + " chars)"; } - String escaped = builder().setSafeRange(' ', '~') - .addEscape('"', "\\\"").addEscape('\\', "\\\\").build() - .escape(value); + String escaped = StringEscapeUtils.ESCAPE_JAVA.translate(value); return '"' + escaped + '"'; } diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml index 6800d01cb6..59c24cdfd4 100644 --- a/oak-segment-tar/pom.xml +++ b/oak-segment-tar/pom.xml @@ -240,6 +240,11 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java index 271cd443b9..628ebb9d9e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java @@ -34,7 +34,7 @@ import java.util.UUID; import javax.jcr.PropertyType; -import org.apache.jackrabbit.guava.common.escape.Escapers; +import org.apache.commons.text.StringEscapeUtils; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; @@ -252,12 +252,7 @@ public class DebugTars { value = value.substring(0, maxCharDisplay) + "... (" + value.length() + " chars)"; } - String escaped = Escapers.builder() - .setSafeRange(' ', '~') - .addEscape('"', "\\\"") - .addEscape('\\', "\\\\") - .build() - .escape(value); + String escaped = StringEscapeUtils.ESCAPE_JAVA.translate(value); return '"' + escaped + '"'; } diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml index 8b821a50d2..f0b979f1f8 100644 --- a/oak-shaded-guava/pom.xml +++ b/oak-shaded-guava/pom.xml @@ -61,6 +61,7 @@ <artifact>*:*</artifact> <excludes> <exclude>com/google/common/annotations/**</exclude> + <exclude>com/google/common/escape/**</exclude> <exclude>com/google/common/eventbus/**</exclude> <exclude>com/google/common/html/**</exclude> <exclude>com/google/common/io/**</exclude> @@ -99,7 +100,6 @@ ${pref}.common.base;version="33.5.0", ${pref}.common.cache;version="33.4.1";uses:="${pref}.common.base,${pref}.common.collect,${pref}.common.util.concurrent", ${pref}.common.collect;version="34.0.0";uses:="${pref}.common.base", - ${pref}.common.escape;version="33.4.1";uses:="${pref}.common.base", ${pref}.common.graph;version="33.4.1";uses:="${pref}.common.collect", ${pref}.common.hash;version="33.5.0";uses:="${pref}.common.base", ${pref}.common.math;version="33.4.1",
