From b1056c285e0187b97d8b4a282d0f4d3ca9f18b9c Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Thu, 11 Aug 2022 11:02:37 +0200 Subject: [PATCH] Fix Can be replaced with 'Files.writeString()' warnings GitOrigin-RevId: f745ef1ef6928beba973da5bbf9f74193646a9e1 --- .../com/intellij/java/openapi/vfs/JrtFileSystemTest.java | 4 ++-- .../src/com/intellij/testFramework/LightTestMigration.java | 2 +- .../intellij/codeInspection/ex/GlobalInspectionContextEx.java | 2 +- .../com/intellij/ide/actions/CreateDesktopEntryAction.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/vfs/JrtFileSystemTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/vfs/JrtFileSystemTest.java index 026431e856bc..cf8394e40cde 100644 --- a/java/java-tests/testSrc/com/intellij/java/openapi/vfs/JrtFileSystemTest.java +++ b/java/java-tests/testSrc/com/intellij/java/openapi/vfs/JrtFileSystemTest.java @@ -66,7 +66,7 @@ public class JrtFileSystemTest extends BareTestFixtureTestCase { private void setupJrtFileSystem() throws IOException { Files.createDirectories(myJrtPath); - Files.write(myJrtPath.resolve("release"), "JAVA_VERSION=9\n".getBytes(StandardCharsets.UTF_8)); + Files.writeString(myJrtPath.resolve("release"), "JAVA_VERSION=9\n"); Path lib = Files.createDirectory(myJrtPath.resolve("lib")); Files.copy(myTestData.resolve("jrt-fs.jar"), lib.resolve("jrt-fs.jar")); Files.copy(myTestData.resolve("image1"), lib.resolve("modules")); @@ -111,7 +111,7 @@ public class JrtFileSystemTest extends BareTestFixtureTestCase { Path modules = myJrtPath.resolve("lib/modules"); Files.move(modules, myJrtPath.resolve("lib/modules.bak"), StandardCopyOption.ATOMIC_MOVE); Files.copy(myTestData.resolve("image2"), modules); - Files.write(myJrtPath.resolve("release"), "JAVA_VERSION=9.0.1\n".getBytes(StandardCharsets.UTF_8)); + Files.writeString(myJrtPath.resolve("release"), "JAVA_VERSION=9.0.1\n"); List events = VfsTestUtil.getEvents(() -> local.refresh(false, true)); assertThat(childNames(myRoot)).describedAs("events=" + events).containsExactlyInAnyOrder("java.base", "test.a", "test.b"); diff --git a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java index 84c6ad07f901..5db9519f4277 100644 --- a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java +++ b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java @@ -75,7 +75,7 @@ class LightTestMigration { FileUtil.delete(myDir.toFile()); Files.createDirectories(myDir); for (Pair file : resultFiles) { - Files.write(file.getFirst(), file.getSecond().getBytes(StandardCharsets.UTF_8)); + Files.writeString(file.getFirst(), file.getSecond()); System.out.println("Written: " + file.getFirst()); } } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java index 2422b33b0305..adb2e7dfde81 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextEx.java @@ -225,7 +225,7 @@ public class GlobalInspectionContextEx extends GlobalInspectionContextBase { try { Path file = InspectionsResultUtil.getInspectionResultPath(outputDir, sameTools.getShortName()); inspectionsResults.add(file); - Files.write(file, ("").getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND); + Files.writeString(file, "", StandardOpenOption.APPEND); } catch (IOException e) { LOG.error(e); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java index 912824b5ce69..10ecdb9e7598 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java @@ -141,7 +141,7 @@ public final class CreateDesktopEntryAction extends DumbAwareAction { Map vars = Map.of("$NAME$", name, "$SCRIPT$", execPath, "$ICON$", iconPath, "$COMMENT$", comment, "$WM_CLASS$", wmClass); String content = ExecUtil.loadTemplate(CreateDesktopEntryAction.class.getClassLoader(), "entry.desktop", vars); Path entryFile = Paths.get(PathManager.getTempPath(), wmClass + ".desktop"); - Files.write(entryFile, content.getBytes(StandardCharsets.UTF_8)); + Files.writeString(entryFile, content); return entryFile; }