(rocketmq) branch develop updated: [ISSUE #7845] Simplify the AbstractSendMessageProcessor#buildMsgContext code using Optional (#7846)

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong 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 eed303db7b [ISSUE #7845] Simplify the 
AbstractSendMessageProcessor#buildMsgContext code using Optional (#7846)
eed303db7b is described below

commit eed303db7b2d0f19029541caa437022f906408a1
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Thu Feb 29 10:50:17 2024 +0800

    [ISSUE #7845] Simplify the AbstractSendMessageProcessor#buildMsgContext 
code using Optional (#7846)
---
 .../rocketmq/broker/processor/AbstractSendMessageProcessor.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
index b348ecb8f0..ba2d1b5f32 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/AbstractSendMessageProcessor.java
@@ -21,6 +21,7 @@ import io.opentelemetry.api.common.Attributes;
 import java.net.SocketAddress;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import org.apache.rocketmq.broker.BrokerController;
@@ -370,15 +371,12 @@ public abstract class AbstractSendMessageProcessor 
implements NettyRequestProces
         sendMessageContext.setCommercialOwner(owner);
 
         Map<String, String> properties = 
MessageDecoder.string2messageProperties(requestHeader.getProperties());
-        String uniqueKey = 
properties.get(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX);
         properties.put(MessageConst.PROPERTY_MSG_REGION, 
this.brokerController.getBrokerConfig().getRegionId());
         properties.put(MessageConst.PROPERTY_TRACE_SWITCH, 
String.valueOf(this.brokerController.getBrokerConfig().isTraceOn()));
         
requestHeader.setProperties(MessageDecoder.messageProperties2String(properties));
 
-        if (uniqueKey == null) {
-            uniqueKey = "";
-        }
-        sendMessageContext.setMsgUniqueKey(uniqueKey);
+        String uniqueKey = 
properties.get(MessageConst.PROPERTY_UNIQ_CLIENT_MESSAGE_ID_KEYIDX);
+        
sendMessageContext.setMsgUniqueKey(Optional.ofNullable(uniqueKey).orElse(""));
 
         if (properties.containsKey(MessageConst.PROPERTY_SHARDING_KEY)) {
             sendMessageContext.setMsgType(MessageType.Order_Msg);