This is an automated email from the ASF dual-hosted git repository.
reschke 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 049c02019e OAK-11786: Remove usage of Guava base.Strings (#2365)
049c02019e is described below
commit 049c02019ecd95a7ff6ad3766e02cf9431593c23
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Jul 3 16:20:31 2025 +0200
OAK-11786: Remove usage of Guava base.Strings (#2365)
---
oak-jcr/pom.xml | 9 ++++-----
.../apache/jackrabbit/oak/jcr/session/SessionSaveDelayer.java | 6 +++---
.../jackrabbit/oak/jcr/session/SessionSaveDelayerConfig.java | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index d89bc1c553..d043e046da 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -216,6 +216,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -490,11 +494,6 @@
<artifactId>org.osgi.service.component</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-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayer.java
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayer.java
index 2a9d1f1695..1e52eacb15 100644
---
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayer.java
+++
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayer.java
@@ -21,7 +21,7 @@ import static
org.apache.jackrabbit.oak.spi.toggle.Feature.newFeature;
import java.io.Closeable;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean;
import org.apache.jackrabbit.oak.spi.toggle.Feature;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
@@ -83,11 +83,11 @@ public class SessionSaveDelayer implements Closeable {
RepositoryManagementMBean mbean = getRepositoryMBean();
if (mbean != null) {
String jmxConfig = mbean.getSessionSaveDelayerConfig();
- if (!Strings.isNullOrEmpty(jmxConfig)) {
+ if (!StringUtils.isEmpty(jmxConfig)) {
config = jmxConfig;
}
}
- if (Strings.isNullOrEmpty(config)) {
+ if (StringUtils.isEmpty(config)) {
return 0;
}
if (!config.equals(lastConfigJson)) {
diff --git
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayerConfig.java
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayerConfig.java
index e89614c103..88376fd7fd 100644
---
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayerConfig.java
+++
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionSaveDelayerConfig.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.oak.commons.json.JsonObject;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
@@ -61,7 +61,7 @@ public class SessionSaveDelayerConfig {
@NotNull
public static SessionSaveDelayerConfig fromJson(@NotNull String
jsonConfig) throws IllegalArgumentException {
- if (Strings.isNullOrEmpty(jsonConfig)) {
+ if (StringUtils.isEmpty(jsonConfig)) {
return new SessionSaveDelayerConfig(List.of());
}
try {
