diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultMessage.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultMessage.java index 901aaf302..f020df07e 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultMessage.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultMessage.java @@ -38,7 +38,7 @@ public class DefaultMessage implements Message { } @Override - public byte[] getPayload() { + public byte[] getBody() { return (payload != null ? payload.clone() : null); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/Message.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/Message.java index 221a3bfaf..526b19eb5 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/Message.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/Message.java @@ -24,7 +24,7 @@ import java.io.Serializable; */ public interface Message extends Serializable { - byte[] getPayload(); + byte[] getBody(); byte[] getChannel(); } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java index f77db0ee1..804cc8091 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/adapter/MessageListenerAdapter.java @@ -220,7 +220,7 @@ public class MessageListenerAdapter implements MessageListener { */ protected Object extractMessage(Message message) { if (serializer != null) { - return serializer.deserialize(message.getPayload()); + return serializer.deserialize(message.getBody()); } return message; } diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java index 22f93c5fd..3f1993ad2 100644 --- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java +++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java @@ -54,8 +54,8 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati @Override public void onMessage(Message message, byte[] pattern) { assertArrayEquals(expectedChannel, message.getChannel()); - assertArrayEquals(expectedMessage, message.getPayload()); - System.out.println("Received message '" + new String(message.getPayload()) + "'"); + assertArrayEquals(expectedMessage, message.getBody()); + System.out.println("Received message '" + new String(message.getBody()) + "'"); } }; @@ -92,8 +92,8 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati @Override public void onMessage(Message message, byte[] pattern) { assertArrayEquals(expectedPattern, pattern); - assertArrayEquals(expectedMessage, message.getPayload()); - System.out.println("Received message '" + new String(message.getPayload()) + "'"); + assertArrayEquals(expectedMessage, message.getBody()); + System.out.println("Received message '" + new String(message.getBody()) + "'"); } };