Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use InputStream's contracts instead of StreamUtils

Browse Source 
Since Spring Framework 6.0 requires Java 17, we can now use
`InputStream` new contracts when manipulating streams.

Closes gh-27702
This commit is contained in:
유예본(Yebon You)/Platform Engineering팀/11ST
2021-11-19 16:08:14 +09:00
committed by Brian Clozel
parent 0770d86936
commit fa1f7f6dc7
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
View File

@@ -108,12 +108,10 @@ public abstract class FileCopyUtils {
Assert.notNull(in, "No InputStream specified");
Assert.notNull(out, "No OutputStream specified");
try {
return StreamUtils.copy(in, out);
}
finally {
close(in);
close(out);
try (in; out) {
int count = (int) in.transferTo(out);
out.flush();
return count;
}
}

14
spring-core/src/main/java/org/springframework/util/StreamUtils.java
View File

@@ -64,9 +64,7 @@ public abstract class StreamUtils {
return EMPTY_CONTENT;
}
ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE);
copy(in, out);
return out.toByteArray();
return in.readAllBytes();
}
/**
@@ -152,15 +150,9 @@ public abstract class StreamUtils {
Assert.notNull(in, "No InputStream specified");
Assert.notNull(out, "No OutputStream specified");
int byteCount = 0;
byte[] buffer = new byte[BUFFER_SIZE];
int bytesRead;
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
byteCount += bytesRead;
}
int count = (int) in.transferTo(out);
out.flush();
return byteCount;
return count;
}
/**