Apache Solr open-source search software
SOLR-15862 Fix linter warnings about guava Strings, removing unused variable (#521)
Jan Høydahlddf73603d6d5
diff --git a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java b/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.javaindex 2a5828c1c6a..3f3284c7eb3 100644--- a/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java+++ b/solr/contrib/s3-repository/src/test/org/apache/solr/s3/S3BackupRepositoryTest.java@@ -19,7 +19,6 @@ package org.apache.solr.s3;import static org.apache.solr.s3.S3BackupRepository.S3_SCHEME;import com.adobe.testing.s3mock.junit4.S3MockRule;-import com.google.common.base.Strings;import java.io.File;import java.io.IOException;import java.io.InputStream;@@ -165,7 +164,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {doTestCopyFileTo(content);// copy a 10Mb file- content += Strings.repeat("1234567890", 1024 * 1024);+ content += "1234567890".repeat(1024 * 1024);doTestCopyFileFrom(content);doTestCopyFileTo(content);}@@ -232,7 +231,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {doRandomAccessTest(content, content.indexOf("content"));// Large text, we force to refill the buffer- String blank = Strings.repeat(" ", 5 * BufferedIndexInput.BUFFER_SIZE);+ String blank = " ".repeat(5 * BufferedIndexInput.BUFFER_SIZE);content = "This is a super large" + blank + "content";doRandomAccessTest(content, content.indexOf("content"));}@@ -246,8 +245,6 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {private void doRandomAccessTest(String content, int position) throws Exception {try (S3BackupRepository repo = getRepository()) {- File tmp = temporaryFolder.newFolder();-// Open an index input on a filepushObject("/my-repo/content", content);IndexInput input = repo.openInput(new URI("s3://my-repo"), "content", IOContext.DEFAULT);@@ -278,7 +275,7 @@ public class S3BackupRepositoryTest extends AbstractBackupRepositoryTest {try (S3BackupRepository repo = getRepository()) {// Open an index input on a file- String blank = Strings.repeat(" ", 5 * BufferedIndexInput.BUFFER_SIZE);+ String blank = " ".repeat(5 * BufferedIndexInput.BUFFER_SIZE);String content = "This is the file " + blank + "content";pushObject("/content", content);diff --git a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.javaindex 87337faea95..653a8f8138c 100644--- a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java+++ b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java@@ -29,7 +29,6 @@ import java.util.Map;import java.util.Random;import com.carrotsearch.randomizedtesting.generators.RandomStrings;-import com.google.common.base.Strings;import org.apache.hadoop.fs.FileSystem;import org.apache.hadoop.hdfs.MiniDFSCluster;import org.apache.lucene.store.Directory;@@ -55,7 +54,7 @@ import org.junit.Test;import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;-@ThreadLeakFilters(defaultFilters = true, filters = {+@ThreadLeakFilters(filters = {SolrIgnoredThreadsFilter.class,QuickPatchThreadsFilter.class,BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)@@ -246,14 +245,16 @@ public class HdfsDirectoryFactoryTest extends SolrTestCaseJ4 {@Testpublic void testIsAbsolute() throws Exception {- try(HdfsDirectoryFactory hdfsFactory = new HdfsDirectoryFactory()) {- String relativePath = Strings.repeat(- RandomStrings.randomAsciiAlphanumOfLength(random(), random().nextInt(10) + 1) + '/',- random().nextInt(5) + 1);+ try (HdfsDirectoryFactory hdfsFactory = new HdfsDirectoryFactory()) {+ String pathToRepeat = RandomStrings.randomAsciiAlphanumOfLength(+ random(),+ random().nextInt(10) + 1+ ) + '/';+ String relativePath =pathToRepeat.repeat(random().nextInt(5) + 1);assertFalse(hdfsFactory.isAbsolute(relativePath));assertFalse(hdfsFactory.isAbsolute("/" + relativePath));- for(String rootPrefix : Arrays.asList("file://", "hdfs://", "s3a://", "foo://")) {+ for (String rootPrefix : Arrays.asList("file://", "hdfs://", "s3a://", "foo://")) {assertTrue(hdfsFactory.isAbsolute(rootPrefix + relativePath));}}