From 8dcf6da120762597c96a0db1fd33666d4893a1d6 Mon Sep 17 00:00:00 2001 From: Felix Schnabel Date: Mon, 16 Sep 2024 23:04:37 +0200 Subject: [PATCH] Fix new `Paths.get` occurences --- .../test/java/io/ballerina/cli/cmd/ProjectWatcherTest.java | 5 ++--- .../inbuilt/analyzer/LogCodeAnalyzerInBuiltPlugin.java | 3 +-- .../inbuilt/generator/LogCodeGeneratorInBuiltPlugin.java | 3 +-- .../inbuilt/modifier/LogCodeModifierInBuiltPlugin.java | 3 +-- .../luhee/plugins/pkg/analyzer/LogCodeAnalyzerPkgPlugin.java | 3 +-- .../plugins/pkg/generator/LogCodeGeneratorPkgPlugin.java | 3 +-- .../luhee/plugins/pkg/modifier/LogCodeModifierPkgPlugin.java | 3 +-- .../debugger/test/utils/client/DAPClientConnector.java | 5 ++--- 8 files changed, 10 insertions(+), 18 deletions(-) diff --git a/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/ProjectWatcherTest.java b/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/ProjectWatcherTest.java index 80ee3056b6af..842d86aa12a4 100644 --- a/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/ProjectWatcherTest.java +++ b/cli/ballerina-cli/src/test/java/io/ballerina/cli/cmd/ProjectWatcherTest.java @@ -12,7 +12,6 @@ import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; @@ -42,8 +41,8 @@ public void setup() throws IOException { this.watchTestResources = testResources.resolve("watchFlagResources"); URI testResourcesURI = Objects.requireNonNull( getClass().getClassLoader().getResource("test-resources")).toURI(); - Files.walkFileTree(Paths.get(testResourcesURI), - new BuildCommandTest.Copy(Paths.get(testResourcesURI), testResources)); + Files.walkFileTree(Path.of(testResourcesURI), + new BuildCommandTest.Copy(Path.of(testResourcesURI), testResources)); watcher = new AtomicReference<>(); } catch (URISyntaxException e) { Assert.fail("error loading resources"); diff --git a/project-api/test-artifacts/log-creator-in-built-code-analyzer/src/main/java/io/luhee/plugins/inbuilt/analyzer/LogCodeAnalyzerInBuiltPlugin.java b/project-api/test-artifacts/log-creator-in-built-code-analyzer/src/main/java/io/luhee/plugins/inbuilt/analyzer/LogCodeAnalyzerInBuiltPlugin.java index 768116979c65..69b1dc2472ea 100644 --- a/project-api/test-artifacts/log-creator-in-built-code-analyzer/src/main/java/io/luhee/plugins/inbuilt/analyzer/LogCodeAnalyzerInBuiltPlugin.java +++ b/project-api/test-artifacts/log-creator-in-built-code-analyzer/src/main/java/io/luhee/plugins/inbuilt/analyzer/LogCodeAnalyzerInBuiltPlugin.java @@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** * A in-built code analyzer which adds a log statement to the beginning of the file. @@ -38,7 +37,7 @@ * @since 2.7.1 */ public class LogCodeAnalyzerInBuiltPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/project-api/test-artifacts/log-creator-in-built-code-generator/src/main/java/io/luhee/plugins/inbuilt/generator/LogCodeGeneratorInBuiltPlugin.java b/project-api/test-artifacts/log-creator-in-built-code-generator/src/main/java/io/luhee/plugins/inbuilt/generator/LogCodeGeneratorInBuiltPlugin.java index 43b480bb0eb3..e7c4ff44fb51 100644 --- a/project-api/test-artifacts/log-creator-in-built-code-generator/src/main/java/io/luhee/plugins/inbuilt/generator/LogCodeGeneratorInBuiltPlugin.java +++ b/project-api/test-artifacts/log-creator-in-built-code-generator/src/main/java/io/luhee/plugins/inbuilt/generator/LogCodeGeneratorInBuiltPlugin.java @@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** @@ -39,7 +38,7 @@ * @since 2.7.1 */ public class LogCodeGeneratorInBuiltPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/project-api/test-artifacts/log-creator-in-built-code-modifier/src/main/java/io/luhee/plugins/inbuilt/modifier/LogCodeModifierInBuiltPlugin.java b/project-api/test-artifacts/log-creator-in-built-code-modifier/src/main/java/io/luhee/plugins/inbuilt/modifier/LogCodeModifierInBuiltPlugin.java index 38a4dd886df4..642b3582421c 100644 --- a/project-api/test-artifacts/log-creator-in-built-code-modifier/src/main/java/io/luhee/plugins/inbuilt/modifier/LogCodeModifierInBuiltPlugin.java +++ b/project-api/test-artifacts/log-creator-in-built-code-modifier/src/main/java/io/luhee/plugins/inbuilt/modifier/LogCodeModifierInBuiltPlugin.java @@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** @@ -39,7 +38,7 @@ * @since 2.7.1 */ public class LogCodeModifierInBuiltPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/project-api/test-artifacts/log-creator-pkg-provided-code-analyzer/src/main/java/io/luhee/plugins/pkg/analyzer/LogCodeAnalyzerPkgPlugin.java b/project-api/test-artifacts/log-creator-pkg-provided-code-analyzer/src/main/java/io/luhee/plugins/pkg/analyzer/LogCodeAnalyzerPkgPlugin.java index 8bfa072a12a2..520536c211ea 100644 --- a/project-api/test-artifacts/log-creator-pkg-provided-code-analyzer/src/main/java/io/luhee/plugins/pkg/analyzer/LogCodeAnalyzerPkgPlugin.java +++ b/project-api/test-artifacts/log-creator-pkg-provided-code-analyzer/src/main/java/io/luhee/plugins/pkg/analyzer/LogCodeAnalyzerPkgPlugin.java @@ -31,7 +31,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** @@ -40,7 +39,7 @@ * @since 2.7.1 */ public class LogCodeAnalyzerPkgPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/project-api/test-artifacts/log-creator-pkg-provided-code-generator/src/main/java/io/luhee/plugins/pkg/generator/LogCodeGeneratorPkgPlugin.java b/project-api/test-artifacts/log-creator-pkg-provided-code-generator/src/main/java/io/luhee/plugins/pkg/generator/LogCodeGeneratorPkgPlugin.java index 4a455c79bee3..d795cad85edd 100644 --- a/project-api/test-artifacts/log-creator-pkg-provided-code-generator/src/main/java/io/luhee/plugins/pkg/generator/LogCodeGeneratorPkgPlugin.java +++ b/project-api/test-artifacts/log-creator-pkg-provided-code-generator/src/main/java/io/luhee/plugins/pkg/generator/LogCodeGeneratorPkgPlugin.java @@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** @@ -40,7 +39,7 @@ */ public class LogCodeGeneratorPkgPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/project-api/test-artifacts/log-creator-pkg-provided-code-modifier/src/main/java/io/luhee/plugins/pkg/modifier/LogCodeModifierPkgPlugin.java b/project-api/test-artifacts/log-creator-pkg-provided-code-modifier/src/main/java/io/luhee/plugins/pkg/modifier/LogCodeModifierPkgPlugin.java index a47ce3e07fd0..71176eeebc88 100644 --- a/project-api/test-artifacts/log-creator-pkg-provided-code-modifier/src/main/java/io/luhee/plugins/pkg/modifier/LogCodeModifierPkgPlugin.java +++ b/project-api/test-artifacts/log-creator-pkg-provided-code-modifier/src/main/java/io/luhee/plugins/pkg/modifier/LogCodeModifierPkgPlugin.java @@ -31,7 +31,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; /*** @@ -41,7 +40,7 @@ */ public class LogCodeModifierPkgPlugin extends CompilerPlugin { - private static final Path filePath = Paths.get("build/logs/log_creator_combined_plugin/compiler-plugin.txt") + private static final Path filePath = Path.of("build/logs/log_creator_combined_plugin/compiler-plugin.txt") .toAbsolutePath(); @Override diff --git a/tests/jballerina-debugger-integration-test/src/main/java/org/ballerinalang/debugger/test/utils/client/DAPClientConnector.java b/tests/jballerina-debugger-integration-test/src/main/java/org/ballerinalang/debugger/test/utils/client/DAPClientConnector.java index 1b7572bd3854..31b23ca111c9 100644 --- a/tests/jballerina-debugger-integration-test/src/main/java/org/ballerinalang/debugger/test/utils/client/DAPClientConnector.java +++ b/tests/jballerina-debugger-integration-test/src/main/java/org/ballerinalang/debugger/test/utils/client/DAPClientConnector.java @@ -36,7 +36,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; @@ -237,10 +236,10 @@ private StreamConnectionProvider createConnectionProvider(String balHome) { if (Utils.getOSName().toLowerCase(Locale.ENGLISH).contains("windows")) { processArgs.add("cmd.exe"); processArgs.add("/c"); - processArgs.add(Paths.get(balHome, "bin", Constant.BALLERINA_SERVER_SCRIPT_NAME + ".bat").toString()); + processArgs.add(Path.of(balHome, "bin", Constant.BALLERINA_SERVER_SCRIPT_NAME + ".bat").toString()); } else { processArgs.add("bash"); - processArgs.add(Paths.get(balHome, "bin", Constant.BALLERINA_SERVER_SCRIPT_NAME).toString()); + processArgs.add(Path.of(balHome, "bin", Constant.BALLERINA_SERVER_SCRIPT_NAME).toString()); } processArgs.add(DebugUtils.JBAL_DEBUG_CMD_NAME);