commit 63846c1fb77df627f001b6bb32ef84ffd0c36394
author Liam Miller-Cushon <cushon@google.com> Thu Jan 27 14:56:16 2022 -0800
committer Javac Team <javac-team+copybara@google.com> Thu Jan 27 14:56:53 2022 -0800
tree 5a34a111a918048705b0e0ce9dad17c0902c6df5
parent 658b7b34d352f491de85c7be734788ce29e18b2f

Automatic code cleanup.

PiperOrigin-RevId: 424714767

java/com/google/turbine/main/Main.java

diff --git a/java/com/google/turbine/main/Main.java b/java/com/google/turbine/main/Main.java
index 07704df..da97bcd 100644
--- a/java/com/google/turbine/main/Main.java
+++ b/java/com/google/turbine/main/Main.java
@@ -344,7 +344,7 @@
       for (SourceFile source : generatedSources.values()) {
         Path to = path.resolve(source.path());
         Files.createDirectories(to.getParent());
-        Files.write(to, source.source().getBytes(UTF_8));
+        Files.writeString(to, source.source());
       }
       return;
     }

java/com/google/turbine/options/TurbineOptionsParser.java

diff --git a/java/com/google/turbine/options/TurbineOptionsParser.java b/java/com/google/turbine/options/TurbineOptionsParser.java
index e0b19f8..e68a546 100644
--- a/java/com/google/turbine/options/TurbineOptionsParser.java
+++ b/java/com/google/turbine/options/TurbineOptionsParser.java
@@ -17,7 +17,6 @@
 package com.google.turbine.options;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
@@ -187,8 +186,7 @@
         if (!Files.exists(paramsPath)) {
           throw new AssertionError("params file does not exist: " + paramsPath);
         }
-        expandParamsFiles(
-            argumentDeque, ARG_SPLITTER.split(new String(Files.readAllBytes(paramsPath), UTF_8)));
+        expandParamsFiles(argumentDeque, ARG_SPLITTER.split(Files.readString(paramsPath)));
       } else {
         argumentDeque.addLast(arg);
       }

javatests/com/google/turbine/zip/ZipTest.java

diff --git a/javatests/com/google/turbine/zip/ZipTest.java b/javatests/com/google/turbine/zip/ZipTest.java
index 0d49e1a..e9dfc44 100644
--- a/javatests/com/google/turbine/zip/ZipTest.java
+++ b/javatests/com/google/turbine/zip/ZipTest.java
@@ -159,7 +159,7 @@
       createEntry(zos, "hello", "world".getBytes(UTF_8));
       zos.setComment("this is a comment");
     }
-    Files.write(path, "trailing garbage".getBytes(UTF_8), StandardOpenOption.APPEND);
+    Files.writeString(path, "trailing garbage", StandardOpenOption.APPEND);
 
     ZipException e = assertThrows(ZipException.class, () -> actual(path));
     assertThat(e).hasMessageThat().isEqualTo("zip file comment length was 33, expected 17");