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/08/21 15:07:44 UTC
(jackrabbit-oak) branch trunk updated: OAK-11050: Remove usage of Guava Strings.repeat (#1659)
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 5eb47a8240 OAK-11050: Remove usage of Guava Strings.repeat (#1659)
5eb47a8240 is described below
commit 5eb47a8240eb355d1bf1801d4826f54f6774feb7
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Aug 21 17:07:38 2024 +0200
OAK-11050: Remove usage of Guava Strings.repeat (#1659)
---
.../oak/plugins/blob/serializer/FSBlobSerializerTest.java | 5 +----
.../jackrabbit/oak/plugins/index/inventory/IndexPrinter.java | 3 +--
.../plugins/index/lucene/directory/IndexRootDirectoryTest.java | 6 ++----
.../org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java | 5 ++---
.../org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java | 3 +--
.../org/apache/jackrabbit/oak/plugins/tika/BinaryStats.java | 4 +---
.../apache/jackrabbit/oak/segment/tool/check/CheckHelper.java | 3 +--
.../org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java | 4 +---
.../jackrabbit/oak/segment/DefaultSegmentWriterTest.java | 7 ++-----
.../jackrabbit/oak/segment/ExternalBlobReferenceTest.java | 5 +----
.../apache/jackrabbit/oak/segment/LongIdMappingBlobStore.java | 6 +-----
.../org/apache/jackrabbit/oak/segment/SegmentParserTest.java | 8 +++-----
.../oak/plugins/document/DocumentStoreStatsPrinter.java | 4 +---
.../oak/plugins/document/MongoDocumentStoreLimitsTest.java | 4 +---
.../oak/plugins/document/VersionGarbageCollectorIT.java | 10 +++++-----
.../apache/jackrabbit/oak/plugins/document/util/UtilsTest.java | 3 +--
.../org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java | 3 +--
.../java/org/apache/jackrabbit/oak/upgrade/SimpleTicker.java | 5 +----
18 files changed, 27 insertions(+), 61 deletions(-)
diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java
index a7a1050fe4..8fd6f7845c 100644
--- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java
+++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializerTest.java
@@ -16,16 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob.serializer;
import java.io.File;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.plugins.blob.serializer.FSBlobSerializer;
import org.apache.jackrabbit.oak.plugins.memory.AbstractBlob;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.jetbrains.annotations.NotNull;
@@ -46,7 +43,7 @@ public class FSBlobSerializerTest {
public void blobs() throws Exception{
int maxInlineSize = 100;
FSBlobSerializer serializer = new FSBlobSerializer(folder.getRoot(), maxInlineSize);
- String data = Strings.repeat("x", maxInlineSize * 10);
+ String data = "x".repeat(maxInlineSize * 10);
Blob b = new ArrayBasedBlob(data.getBytes(StandardCharsets.UTF_8));
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
index a9b1b76ae2..2ccabd43af 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
@@ -28,7 +28,6 @@ import java.util.TimeZone;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;
@@ -257,7 +256,7 @@ public class IndexPrinter implements InventoryPrinter {
newLine();
appendLine(section);
if (topLevel) {
- appendLine(Strings.repeat("=", section.length()));
+ appendLine("=".repeat(section.length()));
newLine();
} else {
leftPadding += 4;
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
index a94b99e4a3..67f208d2a8 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.lucene.directory;
import java.io.File;
import java.io.IOException;
import java.util.List;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
@@ -127,10 +125,10 @@ public class IndexRootDirectoryTest {
@Test
public void longFileName() throws Exception{
- String longName = Strings.repeat("x", IndexRootDirectory.MAX_NAME_LENGTH);
+ String longName = "x".repeat(IndexRootDirectory.MAX_NAME_LENGTH);
assertEquals(longName, IndexRootDirectory.getIndexFolderBaseName(longName));
- String longName2 = Strings.repeat("x", IndexRootDirectory.MAX_NAME_LENGTH + 10);
+ String longName2 = "x".repeat(IndexRootDirectory.MAX_NAME_LENGTH + 10);
assertEquals(longName, IndexRootDirectory.getIndexFolderBaseName(longName2));
}
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
index 9d09416562..d40e6dac46 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
@@ -35,7 +35,6 @@ import joptsimple.BuiltinHelpFormatter;
import joptsimple.HelpFormatter;
import joptsimple.OptionDescriptor;
import joptsimple.OptionSpec;
-import joptsimple.internal.Strings;
import org.jetbrains.annotations.Nullable;
@@ -164,7 +163,7 @@ public class OakHelpFormatter implements HelpFormatter {
String title = bean.title();
if (title != null) {
addNonOptionRow(title);
- addNonOptionRow(Strings.repeat('=', title.length()));
+ addNonOptionRow("=".repeat(title.length()));
}
if (bean.description() != null) {
@@ -187,7 +186,7 @@ public class OakHelpFormatter implements HelpFormatter {
@Override
protected void addHeaders(Collection<? extends OptionDescriptor> options) {
addOptionRow(OPERATIONS, message( "description.header" ) );
- addOptionRow( Strings.repeat('-', OPERATIONS.length()), message( "description.divider" ) );
+ addOptionRow("-".repeat(OPERATIONS.length()), message( "description.divider" ) );
}
@Override
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
index 9de9d3185c..f1c86a92f8 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/CNDStreamWriter.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
@@ -161,7 +160,7 @@ class CNDStreamWriter implements JsopWriter, Closeable {
}
private void space() {
- w.print(Strings.repeat(indent, depth));
+ w.print(indent.repeat(depth));
}
private void optionalResetArrayState() {
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryStats.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryStats.java
index b212bd4bd5..469bd47a81 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryStats.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/BinaryStats.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.tika;
import java.io.File;
@@ -28,7 +27,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ComparisonChain;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.codehaus.groovy.runtime.StringGroovyMethods;
@@ -120,7 +118,7 @@ class BinaryStats {
center("Size", 10);
pw.println(header);
- pw.println(Strings.repeat("_", header.length() + 5));
+ pw.println("_".repeat(header.length() + 5));
for (MimeTypeStats s : stats) {
pw.printf("%-" + maxWidth + "s|%10s|%10s| %-8d|%10s%n",
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/check/CheckHelper.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/check/CheckHelper.java
index 0bbb1b1c60..31269fe25b 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/check/CheckHelper.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/check/CheckHelper.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.segment.tool.check;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
@@ -406,7 +405,7 @@ public class CheckHelper {
Optional<ConsistencyChecker.Revision> r = Optional.ofNullable(revision);
print(
"{0}Latest good revision for path {1} is {2} from {3}",
- Strings.repeat(" ", indent),
+ " ".repeat(indent),
path,
r.map(ConsistencyChecker.Revision::getRevision).orElse("none"),
r.map(ConsistencyChecker.Revision::getTimestamp).map(CheckHelper::timestampToString).orElse("unknown time")
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java
index 9c0fcc5de8..f30be3e337 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/BlobIdRecordTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.oak.segment.DefaultSegmentWriterBuilder.defaultSegmentWriterBuilder;
@@ -28,7 +27,6 @@ import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.segment.Segment.RecordConsumer;
import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -119,7 +117,7 @@ public class BlobIdRecordTest {
@Override
protected String generateId() {
- return Strings.repeat("0", Segment.BLOB_ID_SMALL_LIMIT) + Integer.toString(next++);
+ return "0".repeat(Segment.BLOB_ID_SMALL_LIMIT) + Integer.toString(next++);
}
}
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
index 2cfc6e301a..da70747173 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
@@ -58,7 +57,6 @@ import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import ch.qos.logback.classic.Level;
@@ -391,12 +389,11 @@ public class DefaultSegmentWriterTest {
// 16516 = (Segment.MEDIUM_LIMIT - 1 + 2 + 3)
// 1 byte per char, 2 byte to store the length and 3 bytes for the
// alignment to the integer boundary
- writer.writeString(Strings.repeat("abcdefghijklmno".substring(k, k + 1),
- SegmentTestConstants.MEDIUM_LIMIT - 1));
+ writer.writeString("abcdefghijklmno".substring(k, k + 1).repeat(SegmentTestConstants.MEDIUM_LIMIT - 1));
}
// adding 14280 bytes. 1 byte per char, and 2 bytes to store the length
- RecordId x = writer.writeString(Strings.repeat("x", 14278));
+ RecordId x = writer.writeString("x".repeat(14278));
// writer.length == 262052
// Adding 765 bytes (255 recordIds)
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java
index f1f5e73005..84a23eb22b 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobReferenceTest.java
@@ -29,9 +29,6 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.jackrabbit.guava.common.base.Strings;
-import org.apache.jackrabbit.oak.segment.SegmentBlob;
-import org.apache.jackrabbit.oak.segment.SegmentTestConstants;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.junit.After;
@@ -99,7 +96,7 @@ public class ExternalBlobReferenceTest {
}
private void testBlobIdWithLength(int blobIdLength) throws Exception {
- String blobId = Strings.repeat("x", blobIdLength);
+ String blobId = "x".repeat(blobIdLength);
long blobLength = SegmentTestConstants.MEDIUM_LIMIT;
doReturn(blobId).when(blobStore).writeBlob(any(InputStream.class));
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LongIdMappingBlobStore.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LongIdMappingBlobStore.java
index 5a260e3d28..3306951c55 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LongIdMappingBlobStore.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/LongIdMappingBlobStore.java
@@ -14,18 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import org.apache.jackrabbit.guava.common.base.Strings;
-
public class LongIdMappingBlobStore extends IdMappingBlobStore {
private static int next;
@Override
protected String generateId() {
- return Strings.repeat("0", Segment.BLOB_ID_SMALL_LIMIT * 20) + next++;
+ return "0".repeat(Segment.BLOB_ID_SMALL_LIMIT * 20) + next++;
}
-
}
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
index c280dd71d3..8b70d20442 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
@@ -49,7 +48,6 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.Type;
@@ -77,7 +75,7 @@ public class SegmentParserTest {
when(shortIdBlobStore.writeBlob(any())).thenReturn("shortId");
BlobStore longIdBlobStore = mock(BlobStore.class);
- when(longIdBlobStore.writeBlob(any())).thenReturn(Strings.repeat("shortId", 1000));
+ when(longIdBlobStore.writeBlob(any())).thenReturn("shortId".repeat(1000));
return newArrayList(
new Object[]{null, "No BlobStore"},
@@ -401,7 +399,7 @@ public class SegmentParserTest {
@Test
public void mediumString() throws IOException {
- RecordId stringId = writer.writeString(repeat("s", SMALL_LIMIT));
+ RecordId stringId = writer.writeString("s".repeat(SMALL_LIMIT));
BlobInfo blobInfo = new TestParser(store.getReader(), "mediumString").parseString(stringId);
assertEquals(stringId, blobInfo.blobId);
assertEquals(MEDIUM, blobInfo.blobType);
@@ -409,7 +407,7 @@ public class SegmentParserTest {
@Test
public void longString() throws IOException {
- RecordId stringId = writer.writeString(repeat("s", MEDIUM_LIMIT));
+ RecordId stringId = writer.writeString("s".repeat(MEDIUM_LIMIT));
BlobInfo blobInfo = new TestParser(store.getReader(), "longString"){
@Override protected void onList(RecordId parentId, RecordId listId, int count) { }
}.parseString(stringId);
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinter.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinter.java
index e087c68bfc..70ca2a3213 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinter.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinter.java
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.jackrabbit.guava.common.base.Strings;
-
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;
import org.osgi.service.component.annotations.Component;
@@ -59,7 +57,7 @@ public class DocumentStoreStatsPrinter implements InventoryPrinter {
private void printTitle(PrintWriter pw, String title) {
pw.println(title);
- pw.println(Strings.repeat("=", title.length()));
+ pw.println("=".repeat(title.length()));
}
private void print(PrintWriter pw, Map<String, String> data) {
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java
index 1b6d1aa61e..ae4a8e40a3 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreLimitsTest.java
@@ -24,8 +24,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.Ignore;
import org.junit.Test;
-import org.apache.jackrabbit.guava.common.base.Strings;
-
import static org.junit.Assert.assertNotNull;
/**
@@ -42,7 +40,7 @@ public class MongoDocumentStoreLimitsTest extends AbstractMongoConnectionTest {
builder.child("test");
ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- String longName = Strings.repeat("foo_", 10000);
+ String longName = "foo_".repeat(10000);
String longPath = String.format("/test/%s", longName);
builder = ns.getRoot().builder();
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index 46b39cd130..2805d52945 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -51,7 +51,7 @@ import static java.util.stream.StreamSupport.stream;
import static org.apache.commons.lang3.reflect.FieldUtils.readField;
import static org.apache.commons.lang3.reflect.FieldUtils.writeField;
import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField;
-import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
+
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
import static java.util.concurrent.TimeUnit.HOURS;
@@ -412,7 +412,7 @@ public class VersionGarbageCollectorIT {
@Test
public void gcLongPathSplitDocs() throws Exception {
- gcSplitDocsInternal(repeat("sub", 120));
+ gcSplitDocsInternal("sub".repeat(120));
}
private VersionGCStats gc(VersionGarbageCollector gc, long maxRevisionAge, TimeUnit unit) throws IOException {
@@ -544,7 +544,7 @@ public class VersionGarbageCollectorIT {
@Test
public void testGCDeletedLongPathPropsInclExcl_excludes() throws Exception {
- String longName = repeat("p", PATH_LONG + 1);
+ String longName = "p".repeat(PATH_LONG + 1);
createEmptyProps("/a/b/" + longName + "/x", "/b/c/" + longName + "/x",
"/c/d/" + longName + "/x");
setGCIncludeExcludes(Sets.newHashSet(), Sets.newHashSet("/b/c", "/c"));
@@ -1093,7 +1093,7 @@ public class VersionGarbageCollectorIT {
public void testGCDeletedLongPathProps() throws Exception {
//1. Create nodes with properties
NodeBuilder b1 = store1.getRoot().builder();
- String longPath = repeat("p", PATH_LONG + 1);
+ String longPath = "p".repeat(PATH_LONG + 1);
b1.child(longPath);
// Add property to node & save
@@ -2093,7 +2093,7 @@ public class VersionGarbageCollectorIT {
*/
@Test
public void lateWriteCreateChildGCLargePath() throws Exception {
- String longPath = repeat("p", PATH_LONG + 1);
+ String longPath = "p".repeat(PATH_LONG + 1);
String path = "/grand/parent/" + longPath + "/longPathChild";
doLateWriteCreateChildrenGC(of("/grand/parent"), of(path), "/d",
gapOrphOnly(),
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
index 3f2bdad3e8..e5f90cc9e8 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Iterables;
@@ -125,7 +124,7 @@ public class UtilsTest {
@Test
public void getParentId() throws Exception{
- Path longPath = Path.fromString(PathUtils.concat("/"+Strings.repeat("p", Utils.PATH_LONG + 1), "foo"));
+ Path longPath = Path.fromString(PathUtils.concat("/" + "p".repeat(Utils.PATH_LONG + 1), "foo"));
assertTrue(Utils.isLongPath(longPath));
assertNull(Utils.getParentId(Utils.getIdFromPath(longPath)));
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
index 827821dfea..3493d14d69 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStateUtils.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.state;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -92,7 +91,7 @@ public final class NodeStateUtils {
private static String toString(NodeState ns, int level, String prepend,
String name) {
StringBuilder node = new StringBuilder();
- node.append(repeat(prepend, level)).append(name);
+ node.append(prepend.repeat(level)).append(name);
StringBuilder props = new StringBuilder();
boolean first = true;
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SimpleTicker.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SimpleTicker.java
index 01d2866889..36adbc6499 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SimpleTicker.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SimpleTicker.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.upgrade;
-import org.apache.jackrabbit.guava.common.base.Strings;
-
public class SimpleTicker implements ProgressTicker {
private final int maxTicks;
private int dotCount;
@@ -39,6 +36,6 @@ public class SimpleTicker implements ProgressTicker {
if(dotCount == maxTicks){
decreasing = true;
}
- return Strings.repeat(".", noOfDots);
+ return ".".repeat(noOfDots);
}
}