spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Consistently close streams through try-with-resources

Browse Source 
Also aligns byte array and Reader copying with 7.0.4.

Closes gh-36223

(cherry picked from commit 16f4b23c32)
This commit is contained in:
Juergen Hoeller
2026-01-28 18:17:20 +01:00
parent fb9db146f2
commit 56d8ec25e8
1 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
+11 -41
View File
@@ -16,8 +16,6 @@
package org.springframework.util;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -30,9 +28,11 @@ import java.nio.file.Files;
import org.springframework.lang.Nullable;
/**
* Simple utility methods for file and stream copying. All copy methods use a block size
* of 4096 bytes, and close all affected streams when done. A variation of the copy
* methods from this class that leave streams open can be found in {@link StreamUtils}.
* Simple utility methods for file and stream copying.
*
* <p>All copy methods use a block size of {@value #BUFFER_SIZE} bytes and
* close all affected streams when done. A variation of the copy methods from
* this class that leave streams open can be found in {@link StreamUtils}.
*
* <p>Mainly for use within the framework, but also useful for application code.
*
@@ -76,7 +76,7 @@ public abstract class FileCopyUtils {
public static void copy(byte[] in, File out) throws IOException {
Assert.notNull(in, "No input byte array specified");
Assert.notNull(out, "No output File specified");
copy(new ByteArrayInputStream(in), Files.newOutputStream(out.toPath()));
Files.write(out.toPath(), in);
}
/**
@@ -87,7 +87,7 @@ public abstract class FileCopyUtils {
*/
public static byte[] copyToByteArray(File in) throws IOException {
Assert.notNull(in, "No input File specified");
return copyToByteArray(Files.newInputStream(in.toPath()));
return Files.readAllBytes(in.toPath());
}
@@ -125,12 +125,9 @@ public abstract class FileCopyUtils {
Assert.notNull(in, "No input byte array specified");
Assert.notNull(out, "No OutputStream specified");
try {
try (out) {
out.write(in);
}
finally {
close(out);
}
}
/**
@@ -167,21 +164,11 @@ public abstract class FileCopyUtils {
Assert.notNull(in, "No Reader specified");
Assert.notNull(out, "No Writer specified");
try {
int charCount = 0;
char[] buffer = new char[BUFFER_SIZE];
int charsRead;
while ((charsRead = in.read(buffer)) != -1) {
out.write(buffer, 0, charsRead);
charCount += charsRead;
}
try (in; out) {
int charCount = (int) in.transferTo(out);
out.flush();
return charCount;
}
finally {
close(in);
close(out);
}
}
/**
@@ -195,12 +182,9 @@ public abstract class FileCopyUtils {
Assert.notNull(in, "No input String specified");
Assert.notNull(out, "No Writer specified");
try {
try (out) {
out.write(in);
}
finally {
close(out);
}
}
/**
@@ -220,18 +204,4 @@ public abstract class FileCopyUtils {
return out.toString();
}
/**
* Attempt to close the supplied {@link Closeable}, silently swallowing any
* exceptions.
* @param closeable the {@code Closeable} to close
*/
private static void close(Closeable closeable) {
try {
closeable.close();
}
catch (IOException ex) {
// ignore
}
}
}