You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/12/06 19:24:06 UTC
(jackrabbit-oak) branch OAK-11297 updated: OAK-11297: remove usage of Guava Joiner - oak-lucene
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 e065946ed9 OAK-11297: remove usage of Guava Joiner - oak-lucene
e065946ed9 is described below
commit e065946ed9027654c140de5a8b6e73bc4d00b4fc
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Dec 6 20:23:53 2024 +0100
OAK-11297: remove usage of Guava Joiner - oak-lucene
---
.../jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java | 3 +--
.../index/lucene/directory/ActiveDeletedBlobCollectorFactory.java | 3 +--
.../oak/plugins/index/lucene/directory/IndexRootDirectory.java | 4 +---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
index af41206121..66b16756a7 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -719,7 +718,7 @@ public class LucenePropertyIndex extends FulltextIndex {
}
if (requireNodeLevelExcerpt) {
- String nodeExcerpt = Joiner.on("...").join(columnNameToExcerpts.values());
+ String nodeExcerpt = String.join("...", columnNameToExcerpts.values());
nodeExcerptColumns.forEach(nodeExcerptColumnName -> columnNameToExcerpts.put(nodeExcerptColumnName, nodeExcerpt));
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
index e62bb74980..f5901beb25 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
@@ -37,7 +37,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.io.Closeables;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.io.FileUtils;
@@ -538,7 +537,7 @@ public class ActiveDeletedBlobCollectorFactory {
@Override
public String toString() {
- return String.format("%s|%s|%s", blobId, clock.getTime(), Joiner.on("|").join(ids));
+ return String.format("%s|%s|%s", blobId, clock.getTime(), String.join("|", ids));
}
}
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
index a3ba5335ff..445ca81beb 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.lucene.directory;
import java.io.File;
@@ -31,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.ListMultimap;
@@ -205,7 +203,7 @@ public class IndexRootDirectory {
}
Collections.reverse(result);
- String name = Joiner.on('_').join(result);
+ String name = String.join("_", result);
if (name.length() > MAX_NAME_LENGTH){
name = name.substring(0, MAX_NAME_LENGTH);
}