commit 03b3ec9bd121d761789288b9fae0da16f7c2d00b
author fangjian0423 <fangjian0423@gmail.com> Fri Mar 01 16:42:26 2019 +0800
committer fangjian0423 <fangjian0423@gmail.com> Fri Mar 01 16:42:26 2019 +0800
tree b477d0c1ffea7b43fe8db0ae1ad3976444d218c6
parent 64192e83bdc53d642632d992bbe676826e87f5c5

extract toRMQHeaderKey method to generate rmq header key

rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java

diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
index 05e64d7..bd00740 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/RocketMQUtil.java
@@ -78,20 +78,24 @@
         org.apache.rocketmq.common.message.MessageExt message) {
         MessageBuilder messageBuilder =
             MessageBuilder.withPayload(message.getBody()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.KEYS, message.getKeys()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TAGS, message.getTags()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TOPIC, message.getTopic()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.MESSAGE_ID, message.getMsgId()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.BORN_TIMESTAMP, message.getBornTimestamp()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.BORN_HOST, message.getBornHostString()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.FLAG, message.getFlag()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.QUEUE_ID, message.getQueueId()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.SYS_FLAG, message.getSysFlag()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TRANSACTION_ID, message.getTransactionId());
+                setHeader(toRocketHeaderKey(RocketMQHeaders.KEYS), message.getKeys()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TAGS), message.getTags()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TOPIC), message.getTopic()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.MESSAGE_ID), message.getMsgId()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.BORN_TIMESTAMP), message.getBornTimestamp()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.BORN_HOST), message.getBornHostString()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.FLAG), message.getFlag()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.QUEUE_ID), message.getQueueId()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.SYS_FLAG), message.getSysFlag()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TRANSACTION_ID), message.getTransactionId());
         addUserProperties(message.getProperties(), messageBuilder);
         return messageBuilder.build();
     }
 
+    public static String toRocketHeaderKey(String rawKey) {
+        return RocketMQHeaders.PREFIX + rawKey;
+    }
+
     private static void addUserProperties(Map<String, String> properties, MessageBuilder messageBuilder) {
         if (!CollectionUtils.isEmpty(properties)) {
             properties.forEach((key, val) -> {
@@ -107,11 +111,11 @@
         org.apache.rocketmq.common.message.Message message) {
         MessageBuilder messageBuilder =
             MessageBuilder.withPayload(message.getBody()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.KEYS, message.getKeys()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TAGS, message.getTags()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TOPIC, message.getTopic()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.FLAG, message.getFlag()).
-                setHeader(RocketMQHeaders.PREFIX + RocketMQHeaders.TRANSACTION_ID, message.getTransactionId());
+                setHeader(toRocketHeaderKey(RocketMQHeaders.KEYS), message.getKeys()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TAGS), message.getTags()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TOPIC), message.getTopic()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.FLAG), message.getFlag()).
+                setHeader(toRocketHeaderKey(RocketMQHeaders.TRANSACTION_ID), message.getTransactionId());
         addUserProperties(message.getProperties(), messageBuilder);
         return messageBuilder.build();
     }