Skip to content

Improve consistency in StandardMultipartFile implementation #34241

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

Closed
wants to merge 2 commits into from
Closed

Improve consistency in StandardMultipartFile implementation #34241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6fb4a3
StandardMultipartFile refactor
nuheajiohc Jan 11, 2025
1fcc63e
remove unused imports
nuheajiohc Jan 11, 2025
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
12 changes: 3 additions & 9 deletions ...n/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.io.InputStream;
import java.io.Serializable;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -242,7 +241,7 @@ public String getContentType() {

@Override
public boolean isEmpty() {
return (this.part.getSize() == 0);
return (getSize() == 0);
}

@Override
Expand All @@ -252,7 +251,7 @@ public long getSize() {

@Override
public byte[] getBytes() throws IOException {
return FileCopyUtils.copyToByteArray(this.part.getInputStream());
return FileCopyUtils.copyToByteArray(getInputStream());
}

@Override
Expand All @@ -270,14 +269,9 @@ public void transferTo(File dest) throws IOException, IllegalStateException {
// At least we offloaded the file from memory storage; it'll get deleted
// from the temp dir eventually in any case. And for our user's purposes,
// we can manually copy it to the requested location as a fallback.
FileCopyUtils.copy(this.part.getInputStream(), Files.newOutputStream(dest.toPath()));
FileCopyUtils.copy(getInputStream(), Files.newOutputStream(dest.toPath()));
}
}

@Override
public void transferTo(Path dest) throws IOException, IllegalStateException {
FileCopyUtils.copy(this.part.getInputStream(), Files.newOutputStream(dest));
}
}

}
Loading