From e31914badaaf10def9824db0afe383b6753a8e85 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 12 Nov 2018 16:05:50 +0100 Subject: [PATCH] Polishing --- .../core/codec/CharSequenceEncoder.java | 6 ++---- .../core/io/buffer/DefaultDataBufferFactory.java | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java index d6bf4e96db..3c420d94bc 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java @@ -82,14 +82,12 @@ public final class CharSequenceEncoder extends AbstractEncoder { } private Charset getCharset(@Nullable MimeType mimeType) { - Charset charset; if (mimeType != null && mimeType.getCharset() != null) { - charset = mimeType.getCharset(); + return mimeType.getCharset(); } else { - charset = DEFAULT_CHARSET; + return DEFAULT_CHARSET; } - return charset; } diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java index 67afdba079..0525cee6d0 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java @@ -98,7 +98,7 @@ public class DefaultDataBufferFactory implements DataBufferFactory { } @Override - public DataBuffer wrap(byte[] bytes) { + public DefaultDataBuffer wrap(byte[] bytes) { ByteBuffer wrapper = ByteBuffer.wrap(bytes); return DefaultDataBuffer.fromFilledByteBuffer(this, wrapper); } @@ -109,16 +109,14 @@ public class DefaultDataBufferFactory implements DataBufferFactory { * in {@code dataBuffers}. */ @Override - public DataBuffer join(List dataBuffers) { + public DefaultDataBuffer join(List dataBuffers) { Assert.notEmpty(dataBuffers, "'dataBuffers' must not be empty"); int capacity = dataBuffers.stream() .mapToInt(DataBuffer::readableByteCount) .sum(); - DefaultDataBuffer dataBuffer = allocateBuffer(capacity); - DataBuffer result = dataBuffers.stream() - .map(o -> (DataBuffer) o) - .reduce(dataBuffer, DataBuffer::write); + DefaultDataBuffer result = allocateBuffer(capacity); + dataBuffers.forEach(result::write); dataBuffers.forEach(DataBufferUtils::release); return result; }