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 4a48cf9312 OAK-11297: remove usage of Guava Joiner - oak-blob-plugins
4a48cf9312 is described below
commit 4a48cf9312d99bcbadd221efff459c0cc889d2c3
Author: Julian Reschke <[email protected]>
AuthorDate: Sat Dec 7 13:47:12 2024 +0100
OAK-11297: remove usage of Guava Joiner - oak-blob-plugins
---
.../jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java | 10 ++++------
.../oak/plugins/blob/datastore/SharedDataStoreUtils.java | 7 +++----
.../blob/datastore/directaccess/DataRecordDownloadOptions.java | 4 +---
.../blob/datastore/directaccess/DataRecordUploadToken.java | 8 +++-----
.../oak/plugins/blob/migration/DepthFirstNodeIterator.java | 5 +----
.../datastore/directaccess/DataRecordDownloadOptionsTest.java | 4 +---
6 files changed, 13 insertions(+), 25 deletions(-)
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
index c38578fcae..50cd2943f1 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
@@ -52,8 +52,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.jackrabbit.guava.common.base.Joiner;
-
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -634,14 +632,14 @@ public class MarkSweepGarbageCollector implements
BlobGarbageCollector {
try {
Iterator<String> idIter =
blobStore.resolveChunks(blobId);
- final Joiner delimJoiner =
Joiner.on(DELIM).skipNulls();
Iterator<List<String>> partitions =
Iterators.partition(idIter, getBatchCount());
while (partitions.hasNext()) {
List<String> idBatch =
Lists.transform(partitions.next(), id -> {
- if (logPath) {
- return delimJoiner.join(id,
nodeId);
+ if (logPath && nodeId != null) {
+ return id + DELIM + nodeId;
+ } else {
+ return id;
}
- return id;
});
if (debugMode) {
LOG.trace("chunkIds : {}", idBatch);
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
index 294040b0bd..5f83567ab7 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
@@ -21,7 +21,6 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Splitter;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.collect.Ordering;
@@ -132,7 +131,7 @@ public class SharedDataStoreUtils {
}
public String getNameFromId(String id) {
- return Joiner.on(DELIM).join(getType(), id);
+ return String.join(DELIM, getType(), id);
}
/**
@@ -144,8 +143,8 @@ public class SharedDataStoreUtils {
* @return
*/
public String getNameFromIdPrefix(String id, String prefix) {
- return Joiner.on("_").join(
- Joiner.on(DELIM).join(getType(), id),
+ return String.join("_",
+ String.join(DELIM, getType(), id),
prefix);
}
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptions.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptions.java
index 846fb1b46c..654a2a1df2 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptions.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptions.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess;
import java.nio.charset.Charset;
@@ -27,7 +26,6 @@ import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Strings;
/**
@@ -118,7 +116,7 @@ public class DataRecordDownloadOptions {
if (!Strings.isNullOrEmpty(mediaType)) {
contentTypeHeader = Strings.isNullOrEmpty(characterEncoding) ?
mediaType :
- Joiner.on("; charset=").join(mediaType,
characterEncoding);
+ mediaType + "; charset=" + characterEncoding;
}
}
return contentTypeHeader;
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordUploadToken.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordUploadToken.java
index 481c59a683..f67d2c76b5 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordUploadToken.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordUploadToken.java
@@ -27,8 +27,6 @@ import java.util.Optional;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.jackrabbit.guava.common.base.Joiner;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
import org.jetbrains.annotations.NotNull;
@@ -133,12 +131,12 @@ public class DataRecordUploadToken {
public String getEncodedToken(@NotNull byte[] secret) {
String now = Instant.now().toString();
String toBeEncoded = uploadId.isPresent() ?
- Joiner.on("#").join(blobId, now, uploadId.get()) :
- Joiner.on("#").join(blobId, now);
+ String.join("#", blobId, now, uploadId.get()) :
+ String.join("#", blobId, now);
String toBeSigned = encodeBase64(toBeEncoded);
String sig = getSignedString(toBeSigned, secret);
- return sig != null ? Joiner.on("#").join(toBeSigned, sig) : toBeSigned;
+ return sig != null ? toBeSigned + "#" + sig : toBeSigned;
}
/** Returns the base64 encoded HMAC signature */
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIterator.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIterator.java
index ce2a2d9ae4..a032b8253d 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIterator.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIterator.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob.migration;
import java.util.ArrayDeque;
@@ -27,7 +26,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.guava.common.collect.AbstractIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,8 +87,7 @@ public class DepthFirstNodeIterator extends
AbstractIterator<ChildNodeEntry> {
}
public String getPath() {
- StringBuilder path = new StringBuilder("/");
- return Joiner.on('/').appendTo(path, nameQueue).toString();
+ return new StringBuilder("/").append(String.join("/",
nameQueue)).toString();
}
public DepthFirstNodeIterator switchRoot(NodeState newRoot) {
diff --git
a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptionsTest.java
b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptionsTest.java
index c9f09523d6..693eeaf8e6 100644
---
a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptionsTest.java
+++
b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/directaccess/DataRecordDownloadOptionsTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess;
import java.nio.charset.StandardCharsets;
@@ -25,7 +24,6 @@ import java.util.List;
import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions;
import org.junit.Test;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Lists;
@@ -118,7 +116,7 @@ public class DataRecordDownloadOptionsTest {
null :
(Strings.isNullOrEmpty(characterEncoding) ?
mediaType :
- Joiner.on("; charset=").join(mediaType,
characterEncoding)
+ mediaType + "; charset=" + characterEncoding
);
}
