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

Change order of argument for createPayload

Browse Source 
Expecting data first and metadata second aligns better with the single
arg variant that accepts data. This is also consistent with the
RSocket API in the create methods of ByteBufPayload and DefaultPayload.
This commit is contained in:
Rossen Stoyanchev
2019-07-30 16:16:04 +01:00
parent a1a8781279
commit 5e15bbfbf1
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java
View File

@@ -235,7 +235,7 @@ final class DefaultRSocketRequester implements RSocketRequester {
DataBufferUtils.release(data);
throw ex;
}
return PayloadUtils.createPayload(metadata, data);
return PayloadUtils.createPayload(data, metadata);
}
private Mono<Payload> emptyPayload() {

2
spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
View File

@@ -202,7 +202,7 @@ final class DefaultRSocketRequesterBuilder implements RSocketRequester.Builder {
}
metadata = metadata != null ? metadata : emptyBuffer(strategies);
data = data != null ? data : emptyBuffer(strategies);
return PayloadUtils.createPayload(metadata, data);
return PayloadUtils.createPayload(data, metadata);
}
private DataBuffer emptyBuffer(RSocketStrategies strategies) {

4
spring-messaging/src/main/java/org/springframework/messaging/rsocket/PayloadUtils.java
View File

@@ -72,11 +72,11 @@ public abstract class PayloadUtils {
* or using {@link Unpooled#wrappedBuffer(ByteBuffer...)} if necessary.
* Otherwise, if both are {@link DefaultDataBuffer}, then
* {@link DefaultPayload} is created.
* @param metadata the metadata part for the payload
* @param data the data part for the payload
* @param metadata the metadata part for the payload
* @return the created payload
*/
public static Payload createPayload(DataBuffer metadata, DataBuffer data) {
public static Payload createPayload(DataBuffer data, DataBuffer metadata) {
return data instanceof NettyDataBuffer || metadata instanceof NettyDataBuffer ?
ByteBufPayload.create(asByteBuf(data), asByteBuf(metadata)) :
DefaultPayload.create(asByteBuffer(data), asByteBuffer(metadata));

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultMetadataExtractorTests.java
View File

@@ -163,7 +163,7 @@ public class DefaultMetadataExtractorTests {
private Payload createPayload(DataBuffer metadata) {
return PayloadUtils.createPayload(metadata, this.strategies.dataBufferFactory().allocateBuffer());
return PayloadUtils.createPayload(this.strategies.dataBufferFactory().allocateBuffer(), metadata);
}
}

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

@@ -81,7 +81,7 @@ public class PayloadUtilsTests {
NettyDataBuffer data = createNettyDataBuffer("sample data");
NettyDataBuffer metadata = createNettyDataBuffer("sample metadata");
Payload payload = PayloadUtils.createPayload(metadata, data);
Payload payload = PayloadUtils.createPayload(data, metadata);
try {
assertThat(payload).isInstanceOf(ByteBufPayload.class);
assertThat(payload.data()).isSameAs(data.getNativeBuffer());
@@ -96,7 +96,7 @@ public class PayloadUtilsTests {
public void createWithDefaultBuffers() {
DataBuffer data = createDefaultDataBuffer("sample data");
DataBuffer metadata = createDefaultDataBuffer("sample metadata");
Payload payload = PayloadUtils.createPayload(metadata, data);
Payload payload = PayloadUtils.createPayload(data, metadata);
assertThat(payload).isInstanceOf(DefaultPayload.class);
assertThat(payload.getDataUtf8()).isEqualTo(dataBufferToString(data));
@@ -107,7 +107,7 @@ public class PayloadUtilsTests {
public void createWithNettyAndDefaultBuffers() {
NettyDataBuffer data = createNettyDataBuffer("sample data");
DefaultDataBuffer metadata = createDefaultDataBuffer("sample metadata");
Payload payload = PayloadUtils.createPayload(metadata, data);
Payload payload = PayloadUtils.createPayload(data, metadata);
try {
assertThat(payload).isInstanceOf(ByteBufPayload.class);
assertThat(payload.data()).isSameAs(data.getNativeBuffer());
@@ -122,7 +122,7 @@ public class PayloadUtilsTests {
public void createWithDefaultAndNettyBuffers() {
DefaultDataBuffer data = createDefaultDataBuffer("sample data");
NettyDataBuffer metadata = createNettyDataBuffer("sample metadata");
Payload payload = PayloadUtils.createPayload(metadata, data);
Payload payload = PayloadUtils.createPayload(data, metadata);
try {
assertThat(payload).isInstanceOf(ByteBufPayload.class);
assertThat(payload.getDataUtf8()).isEqualTo(dataBufferToString(data));