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 463af70cf9 OAK-11297: remove usage of Guava Joiner - oak-segment-tar
463af70cf9 is described below
commit 463af70cf9dfdc6429c6ee1271408340c9135088
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Dec 5 21:34:35 2024 +0100
OAK-11297: remove usage of Guava Joiner - oak-segment-tar
---
.../segment/file/CleanupFirstCompactionStrategy.java | 4 +---
.../oak/segment/file/DefaultCleanupStrategy.java | 4 +---
.../jackrabbit/oak/segment/file/FileReaper.java | 3 +--
.../apache/jackrabbit/oak/segment/file/GCJournal.java | 19 ++++++++-----------
.../standby/codec/GetReferencesResponseEncoder.java | 4 +---
5 files changed, 12 insertions(+), 22 deletions(-)
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/CleanupFirstCompactionStrategy.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/CleanupFirstCompactionStrategy.java
index c4150f70e1..f06655015c 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/CleanupFirstCompactionStrategy.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/CleanupFirstCompactionStrategy.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment.file;
import static
org.apache.jackrabbit.oak.segment.compaction.SegmentGCStatus.CLEANUP;
@@ -25,7 +24,6 @@ import static
org.apache.jackrabbit.oak.segment.file.PrintableBytes.newPrintable
import java.io.IOException;
import java.util.List;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.oak.segment.file.tar.CleanupContext;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
@@ -139,7 +137,7 @@ class CleanupFirstCompactionStrategy implements
CompactionStrategy {
if (files.isEmpty()) {
return "none";
} else {
- return Joiner.on(",").join(files);
+ return String.join(",", files);
}
}
}
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
index 862751de51..3aa8b178db 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
@@ -25,8 +25,6 @@ import static
org.apache.jackrabbit.oak.segment.file.PrintableBytes.newPrintable
import java.io.IOException;
import java.util.List;
-import org.apache.jackrabbit.guava.common.base.Joiner;
-
import org.apache.jackrabbit.oak.segment.file.tar.CleanupContext;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.file.tar.TarFiles;
@@ -86,7 +84,7 @@ class DefaultCleanupStrategy implements CleanupStrategy {
if (files.isEmpty()) {
return "none";
} else {
- return Joiner.on(",").join(files);
+ return String.join(",", files);
}
}
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileReaper.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileReaper.java
index b8d4b7676c..a037343f88 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileReaper.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileReaper.java
@@ -21,7 +21,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +78,7 @@ public class FileReaper {
}
}
if (!removed.isEmpty()) {
- logger.info("Removed files {}", Joiner.on(",").join(removed));
+ logger.info("Removed files {}", String.join(",", removed));
}
if (redo.isEmpty()) {
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
index fb80449e83..5d0a520a29 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment.file;
import static java.util.Objects.requireNonNull;
@@ -27,7 +26,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
import org.apache.jackrabbit.oak.segment.spi.persistence.GCJournalFile;
@@ -152,15 +150,14 @@ public class GCJournal {
@Override
public String toString() {
- return Joiner.on(",").join(
- repoSize,
- reclaimedSize,
- ts,
- gcGeneration.getGeneration(),
- gcGeneration.getFullGeneration(),
- nodes,
- root
- );
+ return String.join(",",
+ Long.toString(repoSize),
+ Long.toString(reclaimedSize),
+ Long.toString(ts),
+ Integer.toString(gcGeneration.getGeneration()),
+ Integer.toString(gcGeneration.getFullGeneration()),
+ Long.toString(nodes),
+ root);
}
static GCJournalEntry fromString(String in) {
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
index 10de5cf6b6..17f57db7aa 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetReferencesResponseEncoder.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment.standby.codec;
import java.nio.charset.StandardCharsets;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
@@ -44,7 +42,7 @@ public class GetReferencesResponseEncoder extends
MessageToByteEncoder<GetRefere
}
private static String serialize(String segmentId, Iterable<String>
references) {
- return segmentId + ":" + Joiner.on(",").join(references);
+ return segmentId + ":" + String.join(",", references);
}
}
