(rocketmq) branch develop updated: [ISSUE #7747] Simplify code checks using Optional in ClientRequestProcessor#getRouteInfoByTopic method (#7748)

[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 5e50badca1 [ISSUE #7747] Simplify code checks using Optional in 
ClientRequestProcessor#getRouteInfoByTopic method (#7748)
5e50badca1 is described below

commit 5e50badca1c84ad420ba38b0b986724f4cec4fb7
Author: mxsm <ljbm...@gmail.com>
AuthorDate: Mon Jan 15 11:44:00 2024 +0800

    [ISSUE #7747] Simplify code checks using Optional in 
ClientRequestProcessor#getRouteInfoByTopic method (#7748)
---
 .../apache/rocketmq/namesrv/processor/ClientRequestProcessor.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java
 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java
index 97a132e234..17a070c7f0 100644
--- 
a/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java
+++ 
b/namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/ClientRequestProcessor.java
@@ -19,6 +19,7 @@ package org.apache.rocketmq.namesrv.processor;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import io.netty.channel.ChannelHandlerContext;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.rocketmq.common.MQVersion;
@@ -86,8 +87,8 @@ public class ClientRequestProcessor implements 
NettyRequestProcessor {
             }
 
             byte[] content;
-            Boolean standardJsonOnly = 
requestHeader.getAcceptStandardJsonOnly();
-            if (request.getVersion() >= MQVersion.Version.V4_9_4.ordinal() || 
null != standardJsonOnly && standardJsonOnly) {
+            Boolean standardJsonOnly = 
Optional.ofNullable(requestHeader.getAcceptStandardJsonOnly()).orElse(false);
+            if (request.getVersion() >= MQVersion.Version.V4_9_4.ordinal() || 
standardJsonOnly) {
                 content = 
topicRouteData.encode(SerializerFeature.BrowserCompatible,
                     SerializerFeature.QuoteFieldNames, 
SerializerFeature.SkipTransientField,
                     SerializerFeature.MapSortField);