使用 readAllBytes 和 transferTo 简化代码 (#4115)

Glavo · web-flow · commit 43b769923b3c · 2025-07-26T19:49:05.000+08:00
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/ExecutableHeaderHelper.java
@@ -64,7 +64,7 @@ private static Optional<byte[]> readHeader(ZipFile zip, String suffix) throws IO
             ZipEntry entry = zip.getEntry(location);
             if (entry != null && !entry.isDirectory()) {
                 try (InputStream in = zip.getInputStream(entry)) {
-                    return Optional.of(IOUtils.readFullyAsByteArray(in));
+                    return Optional.of(IOUtils.readFully(in));
                 }
             }
         }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/IntegrityChecker.java
@@ -55,7 +55,7 @@ private static PublicKey getPublicKey() throws IOException {
             if (in == null) {
                 throw new IOException("Public key not found");
             }
-            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(IOUtils.readFullyAsByteArray(in)));
+            return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(IOUtils.readFully(in)));
         } catch (GeneralSecurityException e) {
             throw new IOException("Failed to load public key", e);
         }
@@ -76,7 +76,7 @@ static void verifyJar(Path jarPath) throws IOException {
                     }
 
                     if (SIGNATURE_FILE.equals(filename)) {
-                        signature = IOUtils.readFullyAsByteArray(in);
+                        signature = IOUtils.readFully(in);
                     } else {
                         md.reset();
                         fileFingerprints.put(filename, DigestUtils.digest(md, in));
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.auth.authlibinjector;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyMap;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -32,7 +33,6 @@
 
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.util.io.HttpRequest;
-import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
 import org.jetbrains.annotations.Nullable;
 
@@ -77,7 +77,7 @@ public static AuthlibInjectorServer locateServer(String url) throws IOException
 
             try {
                 AuthlibInjectorServer server = new AuthlibInjectorServer(url);
-                server.refreshMetadata(IOUtils.readFullyAsStringWithClosing(conn.getInputStream()));
+                server.refreshMetadata(new String(conn.getInputStream().readAllBytes(), UTF_8));
                 return server;
             } finally {
                 conn.disconnect();
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeOldInstallTask.java
@@ -25,7 +25,6 @@
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.*;
 import java.nio.file.Path;
@@ -78,7 +77,7 @@ public void execute() throws Exception {
 
             ZipEntry forgeEntry = zipFile.getEntry(installProfile.getInstall().getFilePath());
             try (InputStream is = zipFile.getInputStream(forgeEntry); OutputStream os = new FileOutputStream(forgeFile)) {
-                IOUtils.copyTo(is, os);
+                is.transferTo(os);
             }
 
             setResult(installProfile.getVersionInfo()
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java
@@ -26,7 +26,6 @@
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.DigestUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -164,7 +163,7 @@ private static boolean validateJar(byte[] data, List<String> checksums) throws I
         JarInputStream jar = new JarInputStream(new ByteArrayInputStream(data));
         JarEntry entry = jar.getNextJarEntry();
         while (entry != null) {
-            byte[] eData = IOUtils.readFullyWithoutClosing(jar);
+            byte[] eData = jar.readAllBytes();
             if (entry.getName().equals("checksums.sha1")) {
                 hashes = new String(eData, StandardCharsets.UTF_8).split("\n");
             }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
@@ -25,7 +25,6 @@
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 import org.jackhuang.hmcl.util.io.Unzipper;
 import org.jackhuang.hmcl.util.platform.Bits;
 import org.jackhuang.hmcl.util.platform.*;
@@ -420,7 +419,7 @@ public void extractLog4jConfigurationFile() throws IOException {
         }
 
         try (InputStream input = source; OutputStream output = new FileOutputStream(targetFile)) {
-            IOUtils.copyTo(input, output);
+            input.transferTo(output);
         }
     }
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CacheRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/CacheRepository.java
@@ -21,7 +21,6 @@
 import com.google.gson.annotations.SerializedName;
 import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
 import org.jackhuang.hmcl.util.io.FileUtils;
-import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -288,7 +287,7 @@ public void saveETagIndex() throws IOException {
         try (FileChannel channel = FileChannel.open(indexFile, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
             FileLock lock = channel.lock();
             try {
-                ETagIndex indexOnDisk = fromMaybeMalformedJson(IOUtils.readFullyAsStringWithClosing(Channels.newInputStream(channel)), ETagIndex.class);
+                ETagIndex indexOnDisk = fromMaybeMalformedJson(new String(Channels.newInputStream(channel).readAllBytes(), UTF_8), ETagIndex.class);
                 Map<String, ETagItem> newIndex = joinETagIndexes(indexOnDisk == null ? null : indexOnDisk.eTag, index.values());
                 channel.truncate(0);
                 ByteBuffer writeTo = ByteBuffer.wrap(GSON.toJson(new ETagIndex(newIndex.values())).getBytes(UTF_8));
@@ -424,7 +423,7 @@ public void saveToFile() {
             try (FileChannel channel = FileChannel.open(indexFile, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
                 FileLock lock = channel.lock();
                 try {
-                    Map<String, Object> indexOnDisk = fromMaybeMalformedJson(IOUtils.readFullyAsStringWithClosing(Channels.newInputStream(channel)), mapTypeOf(String.class, Object.class));
+                    Map<String, Object> indexOnDisk = fromMaybeMalformedJson(new String(Channels.newInputStream(channel).readAllBytes(), UTF_8), mapTypeOf(String.class, Object.class));
                     if (indexOnDisk == null) indexOnDisk = new HashMap<>();
                     indexOnDisk.putAll(storage);
                     channel.truncate(0);
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/HttpMultipartRequest.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/HttpMultipartRequest.java
@@ -52,7 +52,7 @@ public HttpMultipartRequest file(String name, String filename, String contentTyp
         addLine(String.format("Content-Disposition: form-data; name=\"%s\"; filename=\"%s\"", name, filename));
         addLine("Content-Type: " + contentType);
         addLine("");
-        IOUtils.copyTo(inputStream, stream);
+        inputStream.transferTo(stream);
         addLine("");
         return this;
     }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/IOUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/IOUtils.java
@@ -62,54 +62,18 @@ public static BufferedReader newBufferedReaderMaybeNativeEncoding(Path file) thr
         }
     }
 
-    /**
-     * Read all bytes to a buffer from given input stream. The stream will not be closed.
-     *
-     * @param stream the InputStream being read.
-     * @return all bytes read from the stream
-     * @throws IOException if an I/O error occurs.
-     */
-    public static byte[] readFullyWithoutClosing(InputStream stream) throws IOException {
-        ByteArrayOutputStream result = new ByteArrayOutputStream(Math.max(stream.available(), 32));
-        copyTo(stream, result);
-        return result.toByteArray();
-    }
-
-    public static String readFullyAsStringWithClosing(InputStream stream) throws IOException {
-        ByteArrayOutputStream result = new ByteArrayOutputStream(Math.max(stream.available(), 32));
-        copyTo(stream, result);
-        return result.toString(UTF_8);
-    }
-
-    /**
-     * Read all bytes to a buffer from given input stream, and close the input stream finally.
-     *
-     * @param stream the InputStream being read, closed finally.
-     * @return all bytes read from the stream
-     * @throws IOException if an I/O error occurs.
-     */
-    public static ByteArrayOutputStream readFully(InputStream stream) throws IOException {
-        try (InputStream is = stream) {
-            ByteArrayOutputStream result = new ByteArrayOutputStream(Math.max(is.available(), 32));
-            copyTo(is, result);
-            return result;
+    public static byte[] readFully(InputStream stream) throws IOException {
+        try (stream) {
+            return stream.readAllBytes();
         }
     }
 
-    public static byte[] readFullyAsByteArray(InputStream stream) throws IOException {
-        return readFully(stream).toByteArray();
-    }
-
     public static String readFullyAsString(InputStream stream) throws IOException {
-        return readFully(stream).toString(UTF_8);
+        return new String(readFully(stream), UTF_8);
     }
 
     public static String readFullyAsString(InputStream stream, Charset charset) throws IOException {
-        return readFully(stream).toString(charset);
-    }
-
-    public static void copyTo(InputStream src, OutputStream dest) throws IOException {
-        copyTo(src, dest, new byte[DEFAULT_BUFFER_SIZE]);
+        return new String(readFully(stream), charset);
     }
 
     public static void copyTo(InputStream src, OutputStream dest, byte[] buf) throws IOException {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/tree/TarFileTree.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/tree/TarFileTree.java
@@ -20,7 +20,6 @@
 
 import kala.compress.archivers.tar.TarArchiveEntry;
 import kala.compress.archivers.tar.TarArchiveReader;
-import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.*;
 import java.nio.file.Files;
@@ -42,7 +41,7 @@ public static TarFileTree open(Path file) throws IOException {
             try (GZIPInputStream input = new GZIPInputStream(Files.newInputStream(file));
                  OutputStream output = Files.newOutputStream(tempFile, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)
             ) {
-                IOUtils.copyTo(input, output);
+                input.transferTo(output);
                 tarFile = new TarArchiveReader(tempFile);
             } catch (Throwable e) {
                 try {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private static Optional<byte[]> readHeader(ZipFile zip, String suffix) throws IO`
`64`	`64`	`ZipEntry entry = zip.getEntry(location);`
`65`	`65`	`if (entry != null && !entry.isDirectory()) {`
`66`	`66`	`try (InputStream in = zip.getInputStream(entry)) {`
`67`		`- return Optional.of(IOUtils.readFullyAsByteArray(in));`
	`67`	`+ return Optional.of(IOUtils.readFully(in));`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private static PublicKey getPublicKey() throws IOException {`
`55`	`55`	`if (in == null) {`
`56`	`56`	`throw new IOException("Public key not found");`
`57`	`57`	`}`
`58`		`- return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(IOUtils.readFullyAsByteArray(in)));`
	`58`	`+ return KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(IOUtils.readFully(in)));`
`59`	`59`	`} catch (GeneralSecurityException e) {`
`60`	`60`	`throw new IOException("Failed to load public key", e);`
`61`	`61`	`}`
`@@ -76,7 +76,7 @@ static void verifyJar(Path jarPath) throws IOException {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if (SIGNATURE_FILE.equals(filename)) {`
`79`		`- signature = IOUtils.readFullyAsByteArray(in);`
	`79`	`+ signature = IOUtils.readFully(in);`
`80`	`80`	`} else {`
`81`	`81`	`md.reset();`
`82`	`82`	`fileFingerprints.put(filename, DigestUtils.digest(md, in));`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import org.jackhuang.hmcl.util.StringUtils;`
`26`	`26`	`import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;`
`27`	`27`	`import org.jackhuang.hmcl.util.io.FileUtils;`
`28`		`-import org.jackhuang.hmcl.util.io.IOUtils;`
`29`	`28`	`import org.jackhuang.hmcl.util.io.Unzipper;`
`30`	`29`	`import org.jackhuang.hmcl.util.platform.Bits;`
`31`	`30`	`import org.jackhuang.hmcl.util.platform.*;`
`@@ -420,7 +419,7 @@ public void extractLog4jConfigurationFile() throws IOException {`
`420`	`419`	`}`
`421`	`420`
`422`	`421`	`try (InputStream input = source; OutputStream output = new FileOutputStream(targetFile)) {`
`423`		`- IOUtils.copyTo(input, output);`
	`422`	`+ input.transferTo(output);`
`424`	`423`	`}`
`425`	`424`	`}`
`426`	`425`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public HttpMultipartRequest file(String name, String filename, String contentTyp`
`52`	`52`	`addLine(String.format("Content-Disposition: form-data; name=\"%s\"; filename=\"%s\"", name, filename));`
`53`	`53`	`addLine("Content-Type: " + contentType);`
`54`	`54`	`addLine("");`
`55`		`- IOUtils.copyTo(inputStream, stream);`
	`55`	`+ inputStream.transferTo(stream);`
`56`	`56`	`addLine("");`
`57`	`57`	`return this;`
`58`	`58`	`}`