spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-27 01:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Use Java Files utilities in FileCopyUtils

Browse Source 
Use helpers from java.nio.file.Files for some methods in FileCopyUtils.

Additionally, add unit tests for the various file-related methods.

Signed-off-by: Patrick Strawderman <pstrawderman@netflix.com>
This commit is contained in:
Patrick Strawderman
2026-01-28 17:46:09 +01:00
committed by Juergen Hoeller
parent 5d33de943b
commit bf5386712c
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
+2 -3
View File
@@ -16,7 +16,6 @@
package org.springframework.util;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
@@ -76,7 +75,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 +86,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());
}
spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
+28
View File
@@ -21,9 +21,12 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import static org.assertj.core.api.Assertions.assertThat;
@@ -87,4 +90,29 @@ class FileCopyUtilsTests {
assertThat(result).isEqualTo(content);
}
@Test
void copyFile(@TempDir Path tempDir) throws IOException {
Path source = tempDir.resolve("src");
Path target = tempDir.resolve("target");
Files.write(source, "content".getBytes());
int bytesWritten = FileCopyUtils.copy(source.toFile(), target.toFile());
assertThat(bytesWritten).isEqualTo(7);
assertThat(target).exists();
assertThat(target).content().isEqualTo("content");
}
@Test
void copyFileToByteArray(@TempDir Path tempDir) throws IOException {
Path source = tempDir.resolve("src");
Files.write(source, "content".getBytes());
assertThat(FileCopyUtils.copyToByteArray(source.toFile())).asString().isEqualTo("content");
}
@Test
void copyByteArrayToFile(@TempDir Path tempDir) throws IOException {
Path target = tempDir.resolve("target");
FileCopyUtils.copy("content".getBytes(), target.toFile());
assertThat(target).exists();
assertThat(target).content().isEqualTo("content");
}
}