Skip to content
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

Use InputStream's new methods instead of StreamUtils #27702

Closed
wants to merge 2 commits into from
Closed

Use InputStream's new methods instead of StreamUtils #27702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a17a9d3
use InputStream's new method instead of StreamUtils
Nov 19, 2021
cd39462
undo removing unused method to support legacy projects
Nov 23, 2021
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
10 changes: 4 additions & 6 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 @@ -108,12 +108,10 @@ public static int copy(InputStream in, OutputStream out) throws IOException {
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;
}
}

Expand Down
4 changes: 1 addition & 3 deletions spring-core/src/main/java/org/springframework/util/StreamUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ public static byte[] copyToByteArray(@Nullable InputStream in) throws IOExceptio
return new byte[0];
}

ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE);
copy(in, out);
return out.toByteArray();
return in.readAllBytes();
poutsma marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
7 changes: 1 addition & 6 deletions ...g-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.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.http.converter;

import java.io.ByteArrayOutputStream;
import java.io.IOException;

import org.springframework.http.HttpInputMessage;
Expand Down Expand Up @@ -53,11 +52,7 @@ public boolean supports(Class<?> clazz) {

@Override
public byte[] readInternal(Class<? extends byte[]> clazz, HttpInputMessage inputMessage) throws IOException {
long contentLength = inputMessage.getHeaders().getContentLength();
ByteArrayOutputStream bos =
new ByteArrayOutputStream(contentLength >= 0 ? (int) contentLength : StreamUtils.BUFFER_SIZE);
StreamUtils.copy(inputMessage.getBody(), bos);
return bos.toByteArray();
return inputMessage.getBody().readAllBytes();
poutsma marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down
24 changes: 8 additions & 16 deletions ...ng-web/src/main/java/org/springframework/http/converter/ResourceHttpMessageConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;

import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.InputStreamResource;
Expand Down Expand Up @@ -131,22 +132,13 @@ protected void writeInternal(Resource resource, HttpOutputMessage outputMessage)

protected void writeContent(Resource resource, HttpOutputMessage outputMessage)
throws IOException, HttpMessageNotWritableException {
try {
InputStream in = resource.getInputStream();
try {
StreamUtils.copy(in, outputMessage.getBody());
}
catch (NullPointerException ex) {
// ignore, see SPR-13620
}
finally {
try {
in.close();
}
catch (Throwable ex) {
// ignore, see SPR-12999
}
}
try (InputStream in = resource.getInputStream()){
OutputStream out = outputMessage.getBody();
in.transferTo(out);
out.flush();
}
catch (NullPointerException ex) {
// ignore, see SPR-13620
}
catch (FileNotFoundException ex) {
// ignore, see SPR-12999
Expand Down