Skip to content

Use Java Files utilities in FileCopyUtils #36221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhoeller merged 1 commit into from
Jan 28, 2026
+30 −3
Merged

Use Java Files utilities in FileCopyUtils #36221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.springframework.util;

import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -76,7 +75,7 @@ public static int copy(File in, File out) throws IOException {
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);
}

/**
Expand All @@ -87,7 +86,7 @@ public static void copy(byte[] in, File out) throws IOException {
*/
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());
}


Expand Down
28 changes: 28 additions & 0 deletions spring-core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
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;

Expand Down Expand Up @@ -87,4 +90,29 @@ void copyToString() throws IOException {
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");
}
}