From 58d52b787f77f1e733b37d3bd7979984ba784745 Mon Sep 17 00:00:00 2001 From: Matthew Biscocho Date: Thu, 12 Dec 2024 17:39:55 -0500 Subject: [PATCH] SolrTestCaseJ4 getFile() returns Path instead --- .../org/apache/solr/SolrTestCaseJ4Test.java | 2 +- .../org/apache/solr/cli/PostToolTest.java | 6 +++--- .../apache/solr/cloud/TestConfigSetsAPI.java | 16 ++++++++-------- .../cloud/TestConfigSetsAPIZkFailure.java | 2 +- .../org/apache/solr/core/TestConfigSets.java | 7 ++++--- .../apache/solr/core/TestCoreContainer.java | 12 ++++++------ .../solr/core/TestSolrConfigHandler.java | 2 +- .../solr/handler/ReplicationTestHelper.java | 4 ++-- .../handler/XmlUpdateRequestHandlerTest.java | 2 +- .../solr/handler/admin/MBeansHandlerTest.java | 2 +- .../designer/TestSchemaDesignerAPI.java | 19 +++++++------------ .../pkg/PackageStoreSchemaPluginsTest.java | 4 ++-- .../schema/ExternalFileFieldSortTest.java | 2 +- .../solr/schema/TestCollationField.java | 9 +++------ .../schema/TestCollationFieldDocValues.java | 8 +++----- .../solr/servlet/SolrRequestParserTest.java | 2 +- .../solr/util/TestSystemIdResolver.java | 4 ++-- .../manager/DeleteByQueryToIdTest.java | 9 ++++----- .../manager/RetryQueueIntegrationTest.java | 2 +- .../manager/SolrAndKafkaIntegrationTest.java | 8 ++------ ...ndKafkaMultiCollectionIntegrationTest.java | 8 ++------ .../manager/SolrAndKafkaReindexTest.java | 8 ++------ .../manager/ZkConfigIntegrationTest.java | 8 ++------ .../TestFoldingMultitermExtrasQuery.java | 2 +- .../solr/schema/TestICUCollationField.java | 4 ++-- .../TestICUCollationFieldDocValues.java | 4 ++-- .../schema/TestICUCollationFieldOptions.java | 2 +- ...ctNamedEntitiesUpdateProcessorFactory.java | 2 +- .../ClusteringComponentDistributedTest.java | 2 +- .../clustering/ClusteringComponentTest.java | 2 +- .../CrossDCProducerSolrStandaloneTest.java | 4 ++-- .../ExtractingRequestHandlerTest.java | 7 ++++--- .../extraction/TestXLSXResponseWriter.java | 3 ++- .../solr/gcs/GCSIncrementalBackupTest.java | 2 +- .../apache/solr/gcs/GCSInstallShardTest.java | 2 +- .../solr/security/jwt/JWTAuthPluginTest.java | 2 +- ...ntifierUpdateProcessorFactoryTestCase.java | 2 +- .../solr/s3/S3IncrementalBackupTest.java | 2 +- .../apache/solr/s3/S3InstallShardTest.java | 2 +- .../ScriptUpdateProcessorFactoryTest.java | 2 +- ...TestBadScriptingUpdateProcessorConfig.java | 6 +++--- .../scripting/xslt/XSLTOutputWriterTest.java | 2 +- .../xslt/XSLTUpdateRequestHandlerTest.java | 4 ++-- .../PrometheusExporterTestBase.java | 5 +++-- .../exporter/MetricsQueryTemplateTest.java | 5 +++-- .../apache/solr/prometheus/utils/Helpers.java | 5 +++-- .../examples/JsonRequestApiTest.java | 2 +- .../client/solrj/io/SolrClientCacheTest.java | 2 +- .../solrj/io/graph/GraphExpressionTest.java | 1 - .../solr/client/solrj/io/graph/GraphTest.java | 1 - .../solr/client/solrj/io/sql/JdbcTest.java | 1 - .../solrj/io/stream/BadClusterTest.java | 1 - .../solrj/io/stream/JDBCStreamTest.java | 1 - .../solrj/io/stream/MathExpressionTest.java | 8 +------- .../ParallelFacetStreamOverAliasTest.java | 1 - .../io/stream/SelectWithEvaluatorsTest.java | 8 +------- .../solrj/io/stream/StreamDecoratorTest.java | 8 +------- .../solrj/io/stream/StreamExpressionTest.java | 8 +------- .../client/solrj/io/stream/StreamingTest.java | 1 - ...onQueryRequestFacetingIntegrationTest.java | 2 +- .../java/org/apache/solr/SolrTestCaseJ4.java | 14 +++++++------- .../AbstractBasicDistributedZkTestBase.java | 2 +- 62 files changed, 114 insertions(+), 166 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java index 976eea1f0db..74d53019dbe 100644 --- a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java +++ b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java @@ -48,7 +48,7 @@ public static void beforeClass() throws Exception { FileUtils.touch(new File(tmpSolrHome, "core0/core.properties")); FileUtils.touch(new File(tmpSolrHome, "core1/core.properties")); - Files.copy(getFile("solr/solr.xml").toPath(), Path.of(tmpSolrHome, "solr.xml")); + Files.copy(getFile("solr/solr.xml"), Path.of(tmpSolrHome, "solr.xml")); initCore("solrconfig-minimal.xml", "schema-tiny.xml", tmpSolrHome, "core1"); } diff --git a/solr/core/src/test/org/apache/solr/cli/PostToolTest.java b/solr/core/src/test/org/apache/solr/cli/PostToolTest.java index 425c9f495dd..da4fce970aa 100644 --- a/solr/core/src/test/org/apache/solr/cli/PostToolTest.java +++ b/solr/core/src/test/org/apache/solr/cli/PostToolTest.java @@ -294,7 +294,7 @@ public void testDoFilesMode() throws IOException { postTool.recursive = 0; postTool.dryRun = true; postTool.solrUpdateUrl = URI.create("http://localhost:8983/solr/fake/update"); - File dir = getFile("exampledocs"); + File dir = getFile("exampledocs").toFile(); int num = postTool.postFiles(new String[] {dir.toString()}, 0, null, null); assertEquals(2, num); } @@ -303,7 +303,7 @@ public void testDoFilesMode() throws IOException { public void testDetectingIfRecursionPossibleInFilesMode() throws IOException { PostTool postTool = new PostTool(); postTool.recursive = 1; // This is the default - File dir = getFile("exampledocs"); + File dir = getFile("exampledocs").toFile(); File doc = File.createTempFile("temp", ".json"); assertTrue(postTool.recursionPossible(new String[] {dir.toString()})); assertFalse(postTool.recursionPossible(new String[] {doc.toString()})); @@ -316,7 +316,7 @@ public void testRecursionAppliesToFilesMode() throws IOException { postTool.recursive = 1; // This is the default postTool.dryRun = true; postTool.solrUpdateUrl = URI.create("http://localhost:8983/solr/fake/update"); - File dir = getFile("exampledocs"); + File dir = getFile("exampledocs").toFile(); int num = postTool.postFiles(new String[] {dir.toString()}, 0, null, null); assertEquals(2, num); } diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java index 8ed3d93b492..886ffb6afca 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java @@ -287,7 +287,7 @@ public void testCreateWithTrust() throws Exception { private void setupBaseConfigSet(String baseConfigSetName, Map oldProps) throws Exception { - final Path configDir = getFile("solr").toPath().resolve("configsets/configset-2/conf"); + final Path configDir = getFile("solr").resolve("configsets/configset-2/conf"); final Path tmpConfigDir = createTempDir(); tmpConfigDir.toFile().deleteOnExit(); PathUtils.copyDirectory(configDir, tmpConfigDir); @@ -1518,7 +1518,7 @@ private long uploadBadConfigSet(String configSetName, String suffix, String user // Read single file from sample configs. This should fail the unzipping return uploadGivenConfigSet( - SolrTestCaseJ4.getFile("solr/configsets/upload/regular/solrconfig.xml"), + SolrTestCaseJ4.getFile("solr/configsets/upload/regular/solrconfig.xml").toFile(), configSetName, suffix, username, @@ -1587,7 +1587,7 @@ private long uploadSingleConfigSetFile( boolean v2) throws IOException { // Read single file from sample configs - final File file = SolrTestCaseJ4.getFile(localFilePath); + final File file = SolrTestCaseJ4.getFile(localFilePath).toFile(); if (v2) { // TODO: switch to use V2Request @@ -1640,7 +1640,7 @@ private long uploadSingleConfigSetFile( private File createTempZipFile(String directoryPath) { try { final File zipFile = createTempFile("configset", "zip").toFile(); - final File directory = SolrTestCaseJ4.getFile(directoryPath); + final File directory = SolrTestCaseJ4.getFile(directoryPath).toFile(); if (log.isInfoEnabled()) { log.info("Directory: {}", directory.getAbsolutePath()); } @@ -1661,7 +1661,7 @@ private File createTempZipFile(String directoryPath) { private File createTempZipFileWithForbiddenTypes(String file) { try { final File zipFile = createTempFile("configset", "zip").toFile(); - final File directory = SolrTestCaseJ4.getFile(file); + final File directory = SolrTestCaseJ4.getFile(file).toFile(); if (log.isInfoEnabled()) { log.info("Directory: {}", directory.getAbsolutePath()); } @@ -1679,7 +1679,7 @@ private File createTempZipFileWithForbiddenTypes(String file) { private File createTempZipFileWithForbiddenContent(String resourcePath) { try { final File zipFile = createTempFile("configset", "zip").toFile(); - final File directory = SolrTestCaseJ4.getFile(resourcePath); + final File directory = SolrTestCaseJ4.getFile(resourcePath).toFile(); if (log.isInfoEnabled()) { log.info("Directory: {}", directory.getAbsolutePath()); } @@ -1850,7 +1850,7 @@ private static Object getObjectByPath(Map root, List hierarchy) { private byte[] readFile(String fname) throws IOException { byte[] buf = null; - try (FileInputStream fis = new FileInputStream(getFile(fname))) { + try (FileInputStream fis = new FileInputStream(getFile(fname).toFile())) { buf = new byte[fis.available()]; fis.read(buf); } @@ -1861,7 +1861,7 @@ private byte[] readFile(String fname) throws IOException { public void testDeleteErrors() throws Exception { final String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString(); final SolrClient solrClient = getHttpSolrClient(baseUrl); - final Path configDir = getFile("solr").toPath().resolve("configsets/configset-2/conf"); + final Path configDir = getFile("solr").resolve("configsets/configset-2/conf"); final Path tmpConfigDir = createTempDir(); tmpConfigDir.toFile().deleteOnExit(); // Ensure ConfigSet is immutable diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java index 3afb80e9e03..bc644f1a362 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java @@ -141,7 +141,7 @@ public void testCreateZkFailure() throws Exception { private void setupBaseConfigSet(String baseConfigSetName, Map oldProps) throws Exception { - final Path configDir = getFile("solr").toPath().resolve("configsets/configset-2/conf"); + final Path configDir = getFile("solr").resolve("configsets/configset-2/conf"); final Path tmpConfigDir = createTempDir(); tmpConfigDir.toFile().deleteOnExit(); PathUtils.copyDirectory(configDir, tmpConfigDir); diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java index df9d72cb508..8bec679b63d 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java @@ -91,7 +91,8 @@ public void testConfigSetServiceFindsConfigSets() { @Test public void testNonExistentConfigSetThrowsException() { - final CoreContainer container = setupContainer(getFile("solr/configsets").getAbsolutePath()); + final CoreContainer container = + setupContainer(getFile("solr/configsets").toAbsolutePath().toString()); try { Exception thrown = expectThrows( @@ -112,7 +113,7 @@ public void testConfigSetOnCoreReload() throws IOException { Path testDirectory = createTempDir("core-reload"); Path configSetsDir = testDirectory.resolve("configsets"); - PathUtils.copyDirectory(getFile("solr/configsets").toPath(), configSetsDir); + PathUtils.copyDirectory(getFile("solr/configsets"), configSetsDir); String csd = configSetsDir.toAbsolutePath().toString(); System.setProperty("configsets", csd); @@ -129,7 +130,7 @@ public void testConfigSetOnCoreReload() throws IOException { // Now copy in a config with a /dump handler and reload Files.copy( - getFile("solr/collection1/conf/solrconfig-withgethandler.xml").toPath(), + getFile("solr/collection1/conf/solrconfig-withgethandler.xml"), configSetsDir.resolve("configset-2/conf").resolve("solrconfig.xml"), StandardCopyOption.REPLACE_EXISTING); container.reload("core1"); diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java index 4aaea27c857..bc93c3d6ad0 100644 --- a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java +++ b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java @@ -61,7 +61,7 @@ public class TestCoreContainer extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() { oldSolrHome = System.getProperty(SOLR_HOME_PROP); - System.setProperty("configsets", getFile("solr/configsets").getAbsolutePath()); + System.setProperty("configsets", getFile("solr/configsets").toAbsolutePath().toString()); } @AfterClass @@ -320,7 +320,7 @@ public void testDeleteBadCores() { MockCoresLocator cl = new MockCoresLocator(); Path solrHome = createTempDir(); - System.setProperty("configsets", getFile("solr/configsets").getAbsolutePath()); + System.setProperty("configsets", getFile("solr/configsets").toAbsolutePath().toString()); final CoreContainer cc = new CoreContainer(SolrXmlConfig.fromString(solrHome, CONFIGSETS_SOLR_XML), cl); @@ -939,7 +939,7 @@ public void testCoreInitFailuresOnReload() throws Exception { Path solrHome = createTempDir(); - System.setProperty("configsets", getFile("solr/configsets").getAbsolutePath()); + System.setProperty("configsets", getFile("solr/configsets").toAbsolutePath().toString()); final CoreContainer cc = new CoreContainer(SolrXmlConfig.fromString(solrHome, CONFIGSETS_SOLR_XML), cl); @@ -986,11 +986,11 @@ public void testCoreInitFailuresOnReload() throws Exception { Path confDir = Path.of(cc.getSolrHome(), "col_bad", "conf"); Files.createDirectories(confDir); Files.copy( - getFile("solr/collection1/conf/solrconfig-defaults.xml").toPath(), + getFile("solr/collection1/conf/solrconfig-defaults.xml"), confDir.resolve("solrconfig.xml"), StandardCopyOption.REPLACE_EXISTING); Files.copy( - getFile("solr/collection1/conf/schema-minimal.xml").toPath(), + getFile("solr/collection1/conf/schema-minimal.xml"), confDir.resolve("schema.xml"), StandardCopyOption.REPLACE_EXISTING); cc.create("col_bad", Map.of()); @@ -1107,7 +1107,7 @@ public void testCoreInitFailuresOnReload() throws Exception { // ---- // fix col_bad's config (again) and RELOAD to fix failure Files.copy( - getFile("solr/collection1/conf/solrconfig-defaults.xml").toPath(), + getFile("solr/collection1/conf/solrconfig-defaults.xml"), confDir.resolve("solrconfig.xml"), StandardCopyOption.REPLACE_EXISTING); cc.reload("col_bad"); diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index b34712c2969..7e4eb1db75f 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -78,7 +78,7 @@ public static ByteBuffer getFileContent(String f) throws IOException { */ public static ByteBuffer getFileContent(String f, boolean loadFromClassPath) throws IOException { ByteBuffer jar; - File file = loadFromClassPath ? getFile(f) : new File(f); + File file = loadFromClassPath ? getFile(f).toFile() : new File(f); try (FileInputStream fis = new FileInputStream(file)) { byte[] buf = new byte[fis.available()]; // TODO: This should check that we read the entire stream diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java index 9016b1b46d8..72276aaffd0 100644 --- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java +++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java @@ -97,9 +97,9 @@ public static int index(SolrClient s, Object... fields) throws Exception { * character copy of file using UTF-8. If port is non-null, will be substituted any time * "TEST_PORT" is found. */ - private static void copyFile(File src, File dst, Integer port, boolean internalCompression) + private static void copyFile(Path src, File dst, Integer port, boolean internalCompression) throws IOException { - try (BufferedReader in = Files.newBufferedReader(src.toPath(), StandardCharsets.UTF_8); + try (BufferedReader in = Files.newBufferedReader(src, StandardCharsets.UTF_8); Writer out = Files.newBufferedWriter(dst.toPath(), StandardCharsets.UTF_8)) { for (String line = in.readLine(); null != line; line = in.readLine()) { if (null != port) { diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java index 0394018e0bf..8dcb465094a 100644 --- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java @@ -105,7 +105,7 @@ public void testRequestParams() throws Exception { @Test public void testExternalEntities() throws Exception { - String file = getFile("mailing_lists.pdf").toURI().toASCIIString(); + String file = getFile("mailing_lists.pdf").toUri().toASCIIString(); String xml = "" + diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java index c4fa6c35e2e..05232b7f05e 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java @@ -130,7 +130,7 @@ public void testAddedMBeanDiff() throws Exception { @Test public void testXMLDiffWithExternalEntity() { - String file = getFile("mailing_lists.pdf").toURI().toASCIIString(); + String file = getFile("mailing_lists.pdf").toUri().toASCIIString(); String xml = "\n" + " cs = new ArrayList<>(); - cs.add(new ContentStreamBase.FileStream(getFile(filename).toPath())); + cs.add(new ContentStreamBase.FileStream(getFile(filename))); req.setContentStreams(cs); return h.queryAndResponse(handler, req); } finally { diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java index 1c95280cac6..4aa5f9eb09f 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java @@ -47,7 +47,8 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { System.setProperty("enable.update.log", "false"); - initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr").getAbsolutePath()); + initCore( + "solrconfig.xml", "schema.xml", getFile("extraction/solr").toAbsolutePath().toString()); createIndex(); // find a reference to the default response writer so we can redirect its output later SolrCore testCore = h.getCore(); diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java index 4b145c601b4..e8300147322 100644 --- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java +++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSIncrementalBackupTest.java @@ -73,7 +73,7 @@ public class GCSIncrementalBackupTest extends AbstractIncrementalBackupTest { public static void setupClass() throws Exception { configureCluster(NUM_NODES) // nodes - .addConfig("conf1", getFile("conf/solrconfig.xml").getParentFile().toPath()) + .addConfig("conf1", getFile("conf/solrconfig.xml").getParent()) .withSolrXml(SOLR_XML) .configure(); } diff --git a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java index 3d0d30262ed..ecb08fa0192 100644 --- a/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java +++ b/solr/modules/gcs-repository/src/test/org/apache/solr/gcs/GCSInstallShardTest.java @@ -52,7 +52,7 @@ public class GCSInstallShardTest extends AbstractInstallShardTest { public static void setupClass() throws Exception { configureCluster(1) // nodes - .addConfig("conf1", getFile("conf/solrconfig.xml").getParentFile().toPath()) + .addConfig("conf1", getFile("conf/solrconfig.xml").getParent()) .withSolrXml(SOLR_XML) .configure(); diff --git a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java index a5642b9f6cd..0d6cc759cb2 100644 --- a/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java +++ b/solr/modules/jwt-auth/src/test/org/apache/solr/security/jwt/JWTAuthPluginTest.java @@ -73,7 +73,7 @@ public class JWTAuthPluginTest extends SolrTestCaseJ4 { static HashMap testJwk; public static Path JWT_TEST_PATH() { - return getFile("solr/security").getParentFile().toPath(); + return getFile("solr/security").getParent(); } static { diff --git a/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java index 15e62d11a50..4690fc1569c 100644 --- a/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java +++ b/solr/modules/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java @@ -40,7 +40,7 @@ public static void beforeClass() throws Exception { initCore( "solrconfig-languageidentifier.xml", "schema.xml", - getFile("langid/solr").getAbsolutePath()); + getFile("langid/solr").toAbsolutePath().toString()); SolrCore core = h.getCore(); UpdateRequestProcessorChain chained = core.getUpdateProcessingChain("lang_id_tika"); assertNotNull(chained); diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java index d10322253cd..7825c33afc1 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3IncrementalBackupTest.java @@ -95,7 +95,7 @@ public static void setupClass() throws Exception { AbstractS3ClientTest.setS3ConfFile(); configureCluster(NUM_NODES) // nodes - .addConfig("conf1", getFile("conf/solrconfig.xml").getParentFile().toPath()) + .addConfig("conf1", getFile("conf/solrconfig.xml").getParent()) .withSolrXml( SOLR_XML .replace("BUCKET", BUCKET_NAME) diff --git a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java index ea21cb58877..590fafdb8a7 100644 --- a/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java +++ b/solr/modules/s3-repository/src/test/org/apache/solr/s3/S3InstallShardTest.java @@ -69,7 +69,7 @@ public static void setupClass() throws Exception { AbstractS3ClientTest.setS3ConfFile(); configureCluster(1) // nodes - .addConfig("conf1", getFile("conf/solrconfig.xml").getParentFile().toPath()) + .addConfig("conf1", getFile("conf/solrconfig.xml").toAbsolutePath()) .withSolrXml( SOLR_XML .replace("BUCKET", BUCKET_NAME) diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java index 3e8bfa9a055..0433440cb25 100644 --- a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java +++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java @@ -44,7 +44,7 @@ public static void beforeClass() throws Exception { initCore( "solrconfig-script-updateprocessor.xml", "schema.xml", - getFile("scripting/solr").getAbsolutePath()); + getFile("scripting/solr").toAbsolutePath().toString()); } /** diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java index 750ae4094bb..c20ef78b620 100644 --- a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java +++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/TestBadScriptingUpdateProcessorConfig.java @@ -32,7 +32,7 @@ public void testBogusScriptEngine() throws Exception { assertConfigs( "bad-solrconfig-bogus-scriptengine-name.xml", "schema.xml", - getFile("scripting/solr/collection1").getParent(), + getFile("scripting/solr/collection1").getParent().toString(), "giberish"); } @@ -42,7 +42,7 @@ public void testMissingScriptFile() throws Exception { assertConfigs( "bad-solrconfig-missing-scriptfile.xml", "schema.xml", - getFile("scripting/solr/collection1").getParent(), + getFile("scripting/solr/collection1").getParent().toString(), "a-file-name-that-does-not-exist.js"); } @@ -52,7 +52,7 @@ public void testInvalidScriptFile() throws Exception { assertConfigs( "bad-solrconfig-invalid-scriptfile.xml", "schema.xml", - getFile("scripting/solr/collection1").getParent(), + getFile("scripting/solr/collection1").getParent().toString(), "invalid.script.xml"); } diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.java index 06122b2f212..f0dd2d85d9d 100644 --- a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.java +++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTOutputWriterTest.java @@ -30,7 +30,7 @@ public class XSLTOutputWriterTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { - initCore("solrconfig.xml", "schema.xml", getFile("scripting/solr").getAbsolutePath()); + initCore("solrconfig.xml", "schema.xml", getFile("scripting/solr").toAbsolutePath().toString()); } @Test diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java index c6a2a876b4c..af61f99e860 100644 --- a/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java +++ b/solr/modules/scripting/src/test/org/apache/solr/scripting/xslt/XSLTUpdateRequestHandlerTest.java @@ -42,7 +42,7 @@ public class XSLTUpdateRequestHandlerTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { - initCore("solrconfig.xml", "schema.xml", getFile("scripting/solr").getAbsolutePath()); + initCore("solrconfig.xml", "schema.xml", getFile("scripting/solr").toAbsolutePath().toString()); } @Override @@ -98,7 +98,7 @@ public void testUpdate() throws Exception { @Test public void testEntities() throws Exception { // use a binary file, so when it's loaded fail with XML error: - String file = getFile("mailing_lists.pdf").toURI().toASCIIString(); + String file = getFile("mailing_lists.pdf").toUri().toASCIIString(); String xml = "" + " name.endsWith(".xml"))); for (File xml : xmlFiles) { diff --git a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java index 104bdda783d..0f3091838a1 100644 --- a/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java +++ b/solr/solr-ref-guide/modules/query-guide/examples/JsonRequestApiTest.java @@ -66,7 +66,7 @@ public static void setupCluster() throws Exception { ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update"); up.setParam("collection", COLLECTION_NAME); - up.addFile(getFile("solrj/techproducts.xml").toPath(), "application/xml"); + up.addFile(getFile("solrj/techproducts.xml"), "application/xml"); up.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true); UpdateResponse updateResponse = up.process(cluster.getSolrClient()); assertEquals(0, updateResponse.getStatus()); diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/SolrClientCacheTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/SolrClientCacheTest.java index 1f7ee0cffbf..91b5364ed7f 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/SolrClientCacheTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/SolrClientCacheTest.java @@ -47,7 +47,7 @@ public static void before() throws Exception { sysProps.forEach(System::setProperty); configureCluster(1) .formatZkServer(true) - .addConfig("config", getFile("solrj/solr/configsets/streaming/conf").toPath()) + .addConfig("config", getFile("solrj/solr/configsets/streaming/conf")) .configure(); } diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java index 6aef7412c9f..487dec09b6f 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java @@ -81,7 +81,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java index 55dfec4f7a2..e16c2692fc0 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java @@ -52,7 +52,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java index 12b9f807847..1a182667a2e 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java @@ -62,7 +62,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/BadClusterTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/BadClusterTest.java index b7c8b8a836c..7f7ce1feeb3 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/BadClusterTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/BadClusterTest.java @@ -53,7 +53,6 @@ public static void configureCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java index 3a2e028130d..b8e200da234 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java @@ -65,7 +65,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java index 1d35aa2e353..9b598c42755 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java @@ -56,19 +56,13 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") .resolve("conf")) .addConfig( "ml", - getFile("solrj") - .toPath() - .resolve("solr") - .resolve("configsets") - .resolve("ml") - .resolve("conf")) + getFile("solrj").resolve("solr").resolve("configsets").resolve("ml").resolve("conf")) .configure(); String collection; diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java index 347894bae42..53f293cc5a0 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ParallelFacetStreamOverAliasTest.java @@ -88,7 +88,6 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java index ac4a4102e55..2abfa0fad3d 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java @@ -52,19 +52,13 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") .resolve("conf")) .addConfig( "ml", - getFile("solrj") - .toPath() - .resolve("solr") - .resolve("configsets") - .resolve("ml") - .resolve("conf")) + getFile("solrj").resolve("solr").resolve("configsets").resolve("ml").resolve("conf")) .configure(); String collection; diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java index 2b19742ae6f..85407c78737 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java @@ -87,19 +87,13 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") .resolve("conf")) .addConfig( "ml", - getFile("solrj") - .toPath() - .resolve("solr") - .resolve("configsets") - .resolve("ml") - .resolve("conf")) + getFile("solrj").resolve("solr").resolve("configsets").resolve("ml").resolve("conf")) .configure(); String collection; diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java index 1541312d02e..2433164e365 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java @@ -83,19 +83,13 @@ public static void setupCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") .resolve("conf")) .addConfig( "ml", - getFile("solrj") - .toPath() - .resolve("solr") - .resolve("configsets") - .resolve("ml") - .resolve("conf")) + getFile("solrj").resolve("solr").resolve("configsets").resolve("ml").resolve("conf")) .configure(); String collection; diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java index 5eadc7ed727..8be2fcd8059 100644 --- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java +++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java @@ -100,7 +100,6 @@ public static void configureCluster() throws Exception { .addConfig( "conf", getFile("solrj") - .toPath() .resolve("solr") .resolve("configsets") .resolve("streaming") diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java index 7912ed858bb..bb66ef233a1 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/json/JsonQueryRequestFacetingIntegrationTest.java @@ -63,7 +63,7 @@ public static void setupCluster() throws Exception { ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update"); up.setParam("collection", COLLECTION_NAME); - up.addFile(getFile("solrj/techproducts.xml").toPath(), "application/xml"); + up.addFile(getFile("solrj/techproducts.xml"), "application/xml"); up.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true); UpdateResponse updateResponse = up.process(cluster.getSolrClient()); assertEquals(0, updateResponse.getStatus()); diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index d7d67f05ef1..3bc9910819b 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -2127,16 +2127,16 @@ public Map> invertField(Map model, } /** - * Gets a resource from the context classloader as {@link File}. This method should only be used, + * Gets a resource from the context classloader as {@link Path}. This method should only be used, * if a real file is needed. To get a stream, code should prefer {@link Class#getResourceAsStream} * using {@code this.getClass()}. */ - public static File getFile(String name) { + public static Path getFile(String name) { final URL url = SolrTestCaseJ4.class.getClassLoader().getResource(name.replace(File.separatorChar, '/')); if (url != null) { try { - return new File(url.toURI()); + return Path.of(url.toURI()); } catch (Exception e) { throw new RuntimeException( "Resource was found on classpath, but cannot be resolved to a " @@ -2144,8 +2144,8 @@ public static File getFile(String name) { + name); } } - final File file = new File(name); - if (file.exists()) { + final Path file = Path.of(name); + if (Files.exists(file)) { return file; } throw new RuntimeException( @@ -2154,11 +2154,11 @@ public static File getFile(String name) { } public static String TEST_HOME() { - return getFile("solr/collection1").getParent(); + return getFile("solr/collection1").getParent().toString(); } public static Path TEST_PATH() { - return getFile("solr/collection1").getParentFile().toPath(); + return getFile("solr/collection1"); } public static Path TEST_COLL1_CONF() { diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java index 91fe79b6c73..0cf43b7bf8f 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java @@ -1265,7 +1265,7 @@ private void testNumberOfCommitsWithCommitAfterAdd() throws SolrServerException, .get(0) .request( new StreamingUpdateRequest( - "/update", getFile("books_numeric_ids.csv").toPath(), "application/csv") + "/update", getFile("books_numeric_ids.csv"), "application/csv") .setCommitWithin(900000) .setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true));