Polishing

spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java

@@ -82,14 +82,12 @@ public final class CharSequenceEncoder extends AbstractEncoder<CharSequence> {
 	}
 
 	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;
 	}
 
 

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<? extends DataBuffer> dataBuffers) {
+	public DefaultDataBuffer join(List<? extends DataBuffer> dataBuffers) {
 		Assert.notEmpty(dataBuffers, "'dataBuffers' must not be empty");
 
 		int capacity = dataBuffers.stream()
 				.mapToInt(DataBuffer::readableByteCount)
 				.sum();
-		DefaultDataBuffer dataBuffer = allocateBuffer(capacity);
+		DefaultDataBuffer result = allocateBuffer(capacity);
-		DataBuffer result = dataBuffers.stream()
+		dataBuffers.forEach(result::write);
-				.map(o -> (DataBuffer) o)
-				.reduce(dataBuffer, DataBuffer::write);
 		dataBuffers.forEach(DataBufferUtils::release);
 		return result;
 	}