You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2018/05/08 05:22:25 UTC
[rocketmq] branch develop updated: Accomodate updated openmessaging
api
This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new c508cb3 Accomodate updated openmessaging api
c508cb3 is described below
commit c508cb33f644355bf2cf52b056a067b0ed0762b9
Author: shutian.lzh <sh...@alibaba-inc.com>
AuthorDate: Tue May 8 13:22:12 2018 +0800
Accomodate updated openmessaging api
---
.../java/io/openmessaging/rocketmq/domain/BytesMessageImpl.java | 9 +++++++--
.../src/main/java/io/openmessaging/rocketmq/utils/OMSUtil.java | 2 +-
.../io/openmessaging/rocketmq/consumer/PullConsumerImplTest.java | 2 +-
.../io/openmessaging/rocketmq/consumer/PushConsumerImplTest.java | 2 +-
pom.xml | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/domain/BytesMessageImpl.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/domain/BytesMessageImpl.java
index 702d561..6d8995a 100644
--- a/openmessaging/src/main/java/io/openmessaging/rocketmq/domain/BytesMessageImpl.java
+++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/domain/BytesMessageImpl.java
@@ -20,6 +20,7 @@ import io.openmessaging.BytesMessage;
import io.openmessaging.KeyValue;
import io.openmessaging.Message;
import io.openmessaging.OMS;
+import io.openmessaging.exception.OMSMessageFormatException;
import org.apache.commons.lang3.builder.ToStringBuilder;
public class BytesMessageImpl implements BytesMessage {
@@ -33,8 +34,12 @@ public class BytesMessageImpl implements BytesMessage {
}
@Override
- public byte[] getBody() {
- return body;
+ public <T> T getBody(Class<T> type) throws OMSMessageFormatException {
+ if (type == byte[].class) {
+ return (T)body;
+ }
+
+ throw new OMSMessageFormatException("", "Cannot assign byte[] to " + type.getName());
}
@Override
diff --git a/openmessaging/src/main/java/io/openmessaging/rocketmq/utils/OMSUtil.java b/openmessaging/src/main/java/io/openmessaging/rocketmq/utils/OMSUtil.java
index 2302141..66af8ce 100644
--- a/openmessaging/src/main/java/io/openmessaging/rocketmq/utils/OMSUtil.java
+++ b/openmessaging/src/main/java/io/openmessaging/rocketmq/utils/OMSUtil.java
@@ -46,7 +46,7 @@ public class OMSUtil {
public static org.apache.rocketmq.common.message.Message msgConvert(BytesMessage omsMessage) {
org.apache.rocketmq.common.message.Message rmqMessage = new org.apache.rocketmq.common.message.Message();
- rmqMessage.setBody(omsMessage.getBody());
+ rmqMessage.setBody(omsMessage.getBody(byte[].class));
KeyValue sysHeaders = omsMessage.sysHeaders();
KeyValue userHeaders = omsMessage.userHeaders();
diff --git a/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PullConsumerImplTest.java b/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PullConsumerImplTest.java
index da2e8a0..5a0fd9c 100644
--- a/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PullConsumerImplTest.java
+++ b/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PullConsumerImplTest.java
@@ -83,7 +83,7 @@ public class PullConsumerImplTest {
Message message = consumer.receive();
assertThat(message.sysHeaders().getString(Message.BuiltinKeys.MESSAGE_ID)).isEqualTo("NewMsgId");
- assertThat(((BytesMessage) message).getBody()).isEqualTo(testBody);
+ assertThat(((BytesMessage) message).getBody(byte[].class)).isEqualTo(testBody);
}
@Test
diff --git a/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PushConsumerImplTest.java b/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PushConsumerImplTest.java
index b55816b..d80e026 100644
--- a/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PushConsumerImplTest.java
+++ b/openmessaging/src/test/java/io/openmessaging/rocketmq/consumer/PushConsumerImplTest.java
@@ -75,7 +75,7 @@ public class PushConsumerImplTest {
@Override
public void onReceived(Message message, Context context) {
assertThat(message.sysHeaders().getString(Message.BuiltinKeys.MESSAGE_ID)).isEqualTo("NewMsgId");
- assertThat(((BytesMessage) message).getBody()).isEqualTo(testBody);
+ assertThat(((BytesMessage) message).getBody(byte[].class)).isEqualTo(testBody);
context.ack();
}
});
diff --git a/pom.xml b/pom.xml
index 5ec47f3..d26e78f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,7 +592,7 @@
<dependency>
<groupId>io.openmessaging</groupId>
<artifactId>openmessaging-api</artifactId>
- <version>0.3.0-alpha</version>
+ <version>0.3.1-alpha-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
--
To stop receiving notification emails like this one, please contact
lizhanhui@apache.org.