dsmiley commented on code in PR #3289:
URL: https://github.com/apache/solr/pull/3289#discussion_r2016848377
##########
solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java:
##########
@@ -147,12 +146,11 @@ public String lookupZKManagedSchemaPath() {
*/
public Path lookupLocalManagedSchemaPath() {
final Path legacyManagedSchemaPath =
- Paths.get(
- loader.getConfigPath().toString(),
- ManagedIndexSchemaFactory.LEGACY_MANAGED_SCHEMA_RESOURCE_NAME);
+ loader
+ .getConfigPath()
+
.resolve(ManagedIndexSchemaFactory.LEGACY_MANAGED_SCHEMA_RESOURCE_NAME);
- Path managedSchemaPath =
- Paths.get(loader.getConfigPath().toString(),
managedSchemaResourceName);
+ Path managedSchemaPath =
loader.getConfigPath().resolve(managedSchemaResourceName);
Review Comment:
nice
##########
solr/core/src/java/org/apache/solr/cli/CLIUtils.java:
##########
@@ -343,7 +342,7 @@ public static boolean isCloudMode(SolrClient solrClient)
throws SolrServerExcept
}
public static Path getConfigSetsDir(Path solrInstallDir) {
- Path configSetsPath = Paths.get("server/solr/configsets/");
+ Path configSetsPath = Path.of("server/solr/configsets/");
Review Comment:
Don't need "Path.of" here at all; pass this slashy string to resolve
##########
solr/core/src/test/org/apache/solr/cli/SolrCLIZkToolsTest.java:
##########
@@ -141,12 +139,11 @@ public void testDownconfig() throws Exception {
int res = CLITestHelper.runTool(args, ConfigSetDownloadTool.class);
assertEquals("Download should have succeeded.", 0, res);
- verifyZkLocalPathsMatch(
- Paths.get(tmp.toAbsolutePath().toString(), "conf"),
"/configs/downconfig1");
+ verifyZkLocalPathsMatch(tmp.resolve("conf").toAbsolutePath(),
"/configs/downconfig1");
// Ensure that empty files don't become directories (SOLR-11198)
- Path emptyFile = Paths.get(tmp.toAbsolutePath().toString(), "conf",
"stopwords", "emptyfile");
+ Path emptyFile =
tmp.resolve("conf").resolve("stopwords").resolve("emptyfile").toAbsolutePath();
Review Comment:
please also drop the `toAbsolutePath` calls on temp dir resolution, as the
path is already absolute. Just touch the lines you modify.
##########
solr/core/src/test/org/apache/solr/cli/ZkSubcommandsTest.java:
##########
@@ -471,7 +470,7 @@ public void testGet() throws Exception {
final String standardOutput2 = runtime.getOutput();
assertTrue(standardOutput2.startsWith("Copying from 'zk:/getNode'"));
- byte[] fileBytes =
Files.readAllBytes(Paths.get(localFile.getAbsolutePath()));
+ byte[] fileBytes =
Files.readAllBytes(Path.of(localFile.getAbsolutePath()));
Review Comment:
no point in getAbsolutePath
##########
solr/test-framework/src/test/org/apache/solr/cloud/MiniSolrCloudClusterTest.java:
##########
@@ -119,8 +118,8 @@ public void testSolrHomeAndResourceLoaders() throws
Exception {
System.setProperty(SOLR_HOME_PROP, fakeSolrHome);
// mock FS from createTempDir don't play nice using 'startsWith' when the
solr stack
- // reconsistutes the path from string so we have to go the string route
here as well...
- final Path workDir =
Paths.get(createTempDir().toAbsolutePath().toString());
+ // reconstitutes the path from string so we have to go the string route
here as well...
+ final Path workDir = Path.of(createTempDir().toAbsolutePath().toString());
Review Comment:
no need to go to from Path to String then Path
##########
solr/core/src/test/org/apache/solr/rest/TestRestManager.java:
##########
@@ -122,7 +122,7 @@ public void testRestManagerEndpoints() throws Exception {
@Test
public void testReloadFromPersistentStorage() throws IOException {
- SolrResourceLoader loader = new SolrResourceLoader(Paths.get("./"));
+ SolrResourceLoader loader = new SolrResourceLoader(Path.of("./"));
Review Comment:
Any place we use "." or "./", it's the same as the empty string, which I
think is more canonical. Maybe a separate PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
