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

Simplify conversion of DataBuffer to String

Browse Source 
See gh-24786
This commit is contained in:
Сергей Цыпанов
2020-03-26 11:39:56 +02:00
committed by Rossen Stoyanchev
parent ac11acb532
commit f17b0125ff
10 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java
View File

@@ -48,9 +48,9 @@ import org.springframework.web.util.UriComponentsBuilder;
*/
public class MockClientHttpRequest extends AbstractClientHttpRequest {
private HttpMethod httpMethod;
private final HttpMethod httpMethod;
private URI url;
private final URI url;
private final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
@@ -160,9 +160,7 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
private static String bufferToString(DataBuffer buffer, Charset charset) {
Assert.notNull(charset, "'charset' must not be null");
byte[] bytes = new byte[buffer.readableByteCount()];
buffer.read(bytes);
return new String(bytes, charset);
return buffer.toString(charset);
}
}

4
spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpResponse.java
View File

@@ -134,9 +134,7 @@ public class MockClientHttpResponse implements ClientHttpResponse {
private static String dumpString(DataBuffer buffer, Charset charset) {
Assert.notNull(charset, "'charset' must not be null");
byte[] bytes = new byte[buffer.readableByteCount()];
buffer.read(bytes);
return new String(bytes, charset);
return buffer.toString(charset);
}
private Charset getCharset() {

5
spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpResponse.java
View File

@@ -153,10 +153,9 @@ public class MockServerHttpResponse extends AbstractServerHttpResponse {
private static String bufferToString(DataBuffer buffer, Charset charset) {
Assert.notNull(charset, "'charset' must not be null");
byte[] bytes = new byte[buffer.readableByteCount()];
buffer.read(bytes);
String str = buffer.toString(charset);
DataBufferUtils.release(buffer);
return new String(bytes, charset);
return str;
}
}