root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Removed DataBufferAllocator.allocateHeapBuffer and allocateDirectBuffer in favor of allocateBuffer.

This commit is contained in:
Arjen Poutsma 2016-01-26 12:39:32 +01:00
parent b8f2388d60
commit 66c424daf9
4 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web-reactive/src/main/java/org/springframework/core/io/buffer/DataBufferAllocator.java
View File

@ -42,20 +42,6 @@ public interface DataBufferAllocator {
*/ */
DataBuffer allocateBuffer(int initialCapacity); DataBuffer allocateBuffer(int initialCapacity);
/**
* Allocates a data buffer of the given initial capacity on the heap.
* @param initialCapacity the initial capacity of the buffer to allocate
* @return the allocated buffer
*/
DataBuffer allocateHeapBuffer(int initialCapacity);
/**
* Allocates a direct data buffer of the given initial capacity.
* @param initialCapacity the initial capacity of the buffer to allocate
* @return the allocated buffer
*/
DataBuffer allocateDirectBuffer(int initialCapacity);
/** /**
* Wraps the given {@link ByteBuffer} in a {@code DataBuffer}. * Wraps the given {@link ByteBuffer} in a {@code DataBuffer}.
* @param byteBuffer the NIO byte buffer to wrap * @param byteBuffer the NIO byte buffer to wrap

15
spring-web-reactive/src/main/java/org/springframework/core/io/buffer/DefaultDataBufferAllocator.java
View File

@ -57,18 +57,9 @@ public class DefaultDataBufferAllocator implements DataBufferAllocator {
@Override @Override
public DefaultDataBuffer allocateBuffer(int initialCapacity) { public DefaultDataBuffer allocateBuffer(int initialCapacity) {
return preferDirect ? allocateDirectBuffer(initialCapacity) : return this.preferDirect ?
allocateHeapBuffer(initialCapacity); new DefaultDataBuffer(ByteBuffer.allocateDirect(initialCapacity)) :
} new DefaultDataBuffer(ByteBuffer.allocate(initialCapacity));
@Override
public DefaultDataBuffer allocateHeapBuffer(int initialCapacity) {
return new DefaultDataBuffer(ByteBuffer.allocate(initialCapacity));
}
@Override
public DefaultDataBuffer allocateDirectBuffer(int initialCapacity) {
return new DefaultDataBuffer(ByteBuffer.allocateDirect(initialCapacity));
} }
@Override @Override

12
spring-web-reactive/src/main/java/org/springframework/core/io/buffer/NettyDataBufferAllocator.java
View File

@ -60,18 +60,6 @@ public class NettyDataBufferAllocator implements DataBufferAllocator {
return new NettyDataBuffer(byteBuf); return new NettyDataBuffer(byteBuf);
} }
@Override
public NettyDataBuffer allocateHeapBuffer(int initialCapacity) {
ByteBuf byteBuf = this.byteBufAllocator.heapBuffer(initialCapacity);
return new NettyDataBuffer(byteBuf);
}
@Override
public NettyDataBuffer allocateDirectBuffer(int initialCapacity) {
ByteBuf byteBuf = this.byteBufAllocator.directBuffer(initialCapacity);
return new NettyDataBuffer(byteBuf);
}
@Override @Override
public NettyDataBuffer wrap(ByteBuffer byteBuffer) { public NettyDataBuffer wrap(ByteBuffer byteBuffer) {
ByteBuf byteBuf = Unpooled.wrappedBuffer(byteBuffer); ByteBuf byteBuf = Unpooled.wrappedBuffer(byteBuffer);

22
spring-web-reactive/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java
View File

@ -37,28 +37,23 @@ import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public class DataBufferTests { public class DataBufferTests {
@Parameterized.Parameter(0) @Parameterized.Parameter
public DataBufferAllocator allocator; public DataBufferAllocator allocator;
@Parameterized.Parameter(1) @Parameterized.Parameters(name = "{0}")
public boolean direct;
@Parameterized.Parameters(name = "{0} - direct: {1}")
public static Object[][] buffers() { public static Object[][] buffers() {
return new Object[][]{ return new Object[][]{
{new NettyDataBufferAllocator(new UnpooledByteBufAllocator(false)), true}, {new NettyDataBufferAllocator(new UnpooledByteBufAllocator(true))},
{new NettyDataBufferAllocator(new UnpooledByteBufAllocator(false)), {new NettyDataBufferAllocator(new UnpooledByteBufAllocator(false))},
false}, {new NettyDataBufferAllocator(new PooledByteBufAllocator(true))},
{new NettyDataBufferAllocator(new PooledByteBufAllocator(false)), true}, {new NettyDataBufferAllocator(new PooledByteBufAllocator(false))},
{new NettyDataBufferAllocator(new PooledByteBufAllocator(false)), false},
{new DefaultDataBufferAllocator(), true}, {new DefaultDataBufferAllocator(), true},
{new DefaultDataBufferAllocator(), false}}; {new DefaultDataBufferAllocator(), false}};
} }
private DataBuffer createDataBuffer(int capacity) { private DataBuffer createDataBuffer(int capacity) {
return direct ? allocator.allocateDirectBuffer(capacity) : return allocator.allocateBuffer(capacity);
allocator.allocateHeapBuffer(capacity);
} }
@Test @Test
@ -183,8 +178,7 @@ public class DataBufferTests {
} }
private ByteBuffer createByteBuffer(int capacity) { private ByteBuffer createByteBuffer(int capacity) {
return direct ? ByteBuffer.allocateDirect(capacity) : return ByteBuffer.allocate(capacity);
ByteBuffer.allocate(capacity);
} }
@Test @Test