Shared static instance of DefaultDataBufferFactory

Author: rstoyanchev

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

@@ -271,7 +271,7 @@ public static StringDecoder allMimeTypes(List<String> delimiters, boolean stripD
 
 	private static class EndFrameBuffer extends DataBufferWrapper {
 
-		private static final DataBuffer BUFFER = new DefaultDataBufferFactory().wrap(new byte[0]);
+		private static final DataBuffer BUFFER = DefaultDataBufferFactory.sharedInstance.wrap(new byte[0]);
 
 		private byte[] delimiter;
 

spring-core/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,12 @@ public class DefaultDataBufferFactory implements DataBufferFactory {
 	 */
 	public static final int DEFAULT_INITIAL_CAPACITY = 256;
 
+	/**
+	 * Shared instance based on the default constructor.
+	 * @since 5.3
+	 */
+	public static final DefaultDataBufferFactory sharedInstance = new DefaultDataBufferFactory();
+
 
 	private final boolean preferDirect;
 
@@ -46,6 +52,7 @@ public class DefaultDataBufferFactory implements DataBufferFactory {
 
 	/**
 	 * Creates a new {@code DefaultDataBufferFactory} with default settings.
+	 * @see #sharedInstance
 	 */
 	public DefaultDataBufferFactory() {
 		this(false);

spring-core/src/test/java/org/springframework/core/io/buffer/LimitedDataBufferListTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,6 @@
  */
 public class LimitedDataBufferListTests {
 
-	private final static DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
-
-
 	@Test
 	void limitEnforced() {
 		Assertions.assertThatThrownBy(() -> new LimitedDataBufferList(5).add(toDataBuffer("123456")))
@@ -51,7 +48,8 @@ void clearResetsCount() {
 
 
 	private static DataBuffer toDataBuffer(String value) {
-		return bufferFactory.wrap(value.getBytes(StandardCharsets.UTF_8));
+		byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+		return DefaultDataBufferFactory.sharedInstance.wrap(bytes);
 	}
 
 }

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractEncoderMethodReturnValueHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,8 +73,6 @@ public abstract class AbstractEncoderMethodReturnValueHandler implements Handler
 
 	private final ReactiveAdapterRegistry adapterRegistry;
 
-	private DataBufferFactory defaultBufferFactory = new DefaultDataBufferFactory();
-
 
 	protected AbstractEncoderMethodReturnValueHandler(List<Encoder<?>> encoders, ReactiveAdapterRegistry registry) {
 		Assert.notEmpty(encoders, "At least one Encoder is required");
@@ -114,7 +112,8 @@ public Mono<Void> handleReturnValue(
 		}
 
 		DataBufferFactory bufferFactory = (DataBufferFactory) message.getHeaders()
-				.getOrDefault(HandlerMethodReturnValueHandler.DATA_BUFFER_FACTORY_HEADER, this.defaultBufferFactory);
+				.getOrDefault(HandlerMethodReturnValueHandler.DATA_BUFFER_FACTORY_HEADER,
+						DefaultDataBufferFactory.sharedInstance);
 
 		MimeType mimeType = (MimeType) message.getHeaders().get(MessageHeaders.CONTENT_TYPE);
 		Flux<DataBuffer> encodedContent = encodeContent(

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/MessageMappingMessageHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.DestinationPatternsMessageCondition;
@@ -60,9 +59,6 @@
 @SuppressWarnings("ALL")
 public class MessageMappingMessageHandlerTests {
 
-	private static final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
-
-
 	private TestEncoderMethodReturnValueHandler returnValueHandler;
 
 
@@ -163,7 +159,7 @@ private Message<?> message(String destination, String... content) {
 	}
 
 	private DataBuffer toDataBuffer(String payload) {
-		return bufferFactory.wrap(payload.getBytes(UTF_8));
+		return DefaultDataBufferFactory.sharedInstance.wrap(payload.getBytes(UTF_8));
 	}
 
 	private void verifyOutputContent(List<String> expected) {

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/reactive/PayloadMethodArgumentResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,7 +154,7 @@ public void validateStringFlux() {
 
 
 	private DataBuffer toDataBuffer(String value) {
-		return new DefaultDataBufferFactory().wrap(value.getBytes(StandardCharsets.UTF_8));
+		return DefaultDataBufferFactory.sharedInstance.wrap(value.getBytes(StandardCharsets.UTF_8));
 	}
 
 

spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java

@@ -232,7 +232,7 @@ public void setupWithAsyncValues() {
 	@Test
 	public void frameDecoderMatchesDataBufferFactory() throws Exception {
 		testPayloadDecoder(new NettyDataBufferFactory(ByteBufAllocator.DEFAULT), PayloadDecoder.ZERO_COPY);
-		testPayloadDecoder(new DefaultDataBufferFactory(), PayloadDecoder.DEFAULT);
+		testPayloadDecoder(DefaultDataBufferFactory.sharedInstance, PayloadDecoder.DEFAULT);
 	}
 
 	private void testPayloadDecoder(DataBufferFactory bufferFactory, PayloadDecoder payloadDecoder)

spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java

@@ -65,8 +65,6 @@ public class DefaultRSocketRequesterTests {
 
 	private final RSocketStrategies strategies = RSocketStrategies.create();
 
-	private final DefaultDataBufferFactory bufferFactory = new DefaultDataBufferFactory();
-
 
 	@BeforeEach
 	public void setUp() {
@@ -244,7 +242,8 @@ public void fluxToMonoIsRejected() {
 	}
 
 	private Payload toPayload(String value) {
-		return PayloadUtils.createPayload(bufferFactory.wrap(value.getBytes(StandardCharsets.UTF_8)));
+		byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+		return PayloadUtils.createPayload(DefaultDataBufferFactory.sharedInstance.wrap(bytes));
 	}
 
 

spring-messaging/src/test/java/org/springframework/messaging/rsocket/MetadataEncoderTests.java

@@ -203,7 +203,7 @@ public void mimeTypeDoesNotMatchConnectionMetadataMimeType() {
 
 	@Test
 	public void defaultDataBufferFactory() {
-		DefaultDataBufferFactory bufferFactory = new DefaultDataBufferFactory();
+		DefaultDataBufferFactory bufferFactory = DefaultDataBufferFactory.sharedInstance;
 		RSocketStrategies strategies = RSocketStrategies.builder().dataBufferFactory(bufferFactory).build();
 
 		DataBuffer buffer = new MetadataEncoder(COMPOSITE_METADATA, strategies)

spring-messaging/src/test/java/org/springframework/messaging/rsocket/PayloadUtilsTests.java

@@ -44,8 +44,6 @@ public class PayloadUtilsTests {
 	private LeakAwareNettyDataBufferFactory nettyBufferFactory =
 			new LeakAwareNettyDataBufferFactory(PooledByteBufAllocator.DEFAULT);
 
-	private DefaultDataBufferFactory defaultBufferFactory = new DefaultDataBufferFactory();
-
 
 	@AfterEach
 	public void tearDown() throws Exception {
@@ -70,7 +68,7 @@ public void retainAndReleaseWithNettyFactory() {
 	@Test
 	public void retainAndReleaseWithDefaultFactory() {
 		Payload payload = ByteBufPayload.create("sample data");
-		DataBuffer buffer = PayloadUtils.retainDataAndReleasePayload(payload, this.defaultBufferFactory);
+		DataBuffer buffer = PayloadUtils.retainDataAndReleasePayload(payload, DefaultDataBufferFactory.sharedInstance);
 
 		assertThat(buffer).isInstanceOf(DefaultDataBuffer.class);
 		assertThat(payload.refCnt()).isEqualTo(0);
@@ -163,7 +161,7 @@ private NettyDataBuffer createNettyDataBuffer(String content) {
 	}
 
 	private DefaultDataBuffer createDefaultDataBuffer(String content) {
-		DefaultDataBuffer buffer = this.defaultBufferFactory.allocateBuffer();
+		DefaultDataBuffer buffer = DefaultDataBufferFactory.sharedInstance.allocateBuffer();
 		buffer.write(content, StandardCharsets.UTF_8);
 		return buffer;
 	}