This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11297
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11297 by this push:
new 2ed3b10781 OAK-11297: remove usage of Guava Joiner - oak-core
2ed3b10781 is described below
commit 2ed3b1078125cde738b7e805ae1340dd4ae8bab2
Author: Julian Reschke <[email protected]>
AuthorDate: Sat Dec 7 11:14:00 2024 +0100
OAK-11297: remove usage of Guava Joiner - oak-core
---
.../org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java | 4 +---
.../jackrabbit/oak/plugins/migration/version/VersionHistoryUtil.java | 3 +--
.../jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java | 4 +---
.../jackrabbit/oak/security/user/CachedPrincipalMembershipReader.java | 4 +---
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
index 2094fcd711..b55ce0343c 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/ConflictValidator.java
@@ -34,8 +34,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.guava.common.base.Joiner;
-
/**
* {@link Validator} which checks the presence of conflict markers
* in the tree in fails the commit if any are found.
@@ -178,7 +176,7 @@ public class ConflictValidator extends DefaultValidator {
}
private static String getChildNodeNamesAsString(NodeState ns) {
- return Joiner.on(',').join(ns.getChildNodeNames());
+ return String.join(",", ns.getChildNodeNames());
}
private static String toString(PropertyState ps) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/version/VersionHistoryUtil.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/version/VersionHistoryUtil.java
index a640c7d5d9..0245753539 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/version/VersionHistoryUtil.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/version/VersionHistoryUtil.java
@@ -46,7 +46,6 @@ import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.util.ISO8601;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +55,7 @@ public class VersionHistoryUtil {
private static final Logger LOG =
LoggerFactory.getLogger(VersionHistoryUtil.class);
public static String getRelativeVersionHistoryPath(String versionableUuid)
{
- return Joiner.on('/').join(concat(
+ return String.join("/", concat(
singleton(""),
getRelativeVersionHistoryPathSegments(versionableUuid),
singleton(versionableUuid)));
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
index e257f8e9eb..beb269ca5f 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.observation.filter;
import static
org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper;
@@ -29,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -180,7 +178,7 @@ public class GlobbingPathFilter implements EventFilter {
@Override
public String toString() {
return toStringHelper(this)
- .add("path", Joiner.on('/').join(pattern))
+ .add("path", String.join("/", pattern))
.toString();
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CachedPrincipalMembershipReader.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CachedPrincipalMembershipReader.java
index 46523bd63f..11ab42b216 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CachedPrincipalMembershipReader.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/CachedPrincipalMembershipReader.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-
import static
org.apache.jackrabbit.oak.security.user.CacheConfiguration.EXPIRATION_NO_CACHE;
import java.security.Principal;
@@ -27,7 +26,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.jcr.AccessDeniedException;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -227,7 +225,7 @@ class CachedPrincipalMembershipReader implements
CachedMembershipReader {
}
}
cache.setProperty(CacheConstants.REP_EXPIRATION,
LongUtils.calculateExpirationTime(expiration));
- String value = (groupPrincipals.isEmpty()) ? "" :
Joiner.on(",").join(Iterables.transform(groupPrincipals, input ->
Text.escape(input.getName())));
+ String value = (groupPrincipals.isEmpty()) ? "" : String.join(",",
Iterables.transform(groupPrincipals, input -> Text.escape(input.getName())));
cache.setProperty(this.propertyName, value);
root.commit(CommitMarker.asCommitAttributes());
