From d6fb4a3d51bb2da6b0b7c4455e25138a7bfd6506 Mon Sep 17 00:00:00 2001 From: jaehun Date: Sat, 11 Jan 2025 14:12:55 +0900 Subject: [PATCH 1/2] StandardMultipartFile refactor Signed-off-by: jaehun --- .../support/StandardMultipartHttpServletRequest.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java index e736d2d560d7..b0517db65769 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java @@ -242,7 +242,7 @@ public String getContentType() { @Override public boolean isEmpty() { - return (this.part.getSize() == 0); + return (getSize() == 0); } @Override @@ -252,7 +252,7 @@ public long getSize() { @Override public byte[] getBytes() throws IOException { - return FileCopyUtils.copyToByteArray(this.part.getInputStream()); + return FileCopyUtils.copyToByteArray(getInputStream()); } @Override @@ -270,14 +270,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)); - } } } From 1fcc63e0f16694eb01a438bb1b7b155ccf010a9c Mon Sep 17 00:00:00 2001 From: jaehun Date: Sat, 11 Jan 2025 16:40:50 +0900 Subject: [PATCH 2/2] remove unused imports Signed-off-by: jaehun --- .../multipart/support/StandardMultipartHttpServletRequest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java index b0517db65769..0b886b910137 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java @@ -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;