(dubbo) branch 3.2 updated: optimize: the handling logic of PathAndInvokerMapper (#14534)

[suncairong]

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

suncairong pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 85282cdaca optimize: the handling logic of PathAndInvokerMapper 
(#14534)
85282cdaca is described below

commit 85282cdaca344a2262b73aa68c37a3255217e64c
Author: funkye <jian...@apache.org>
AuthorDate: Fri Aug 16 16:10:16 2024 +0800

    optimize: the handling logic of PathAndInvokerMapper (#14534)
    
    * optimize: the handling logic of PathAndInvokerMapper
    
    * code format
    
    * code format
---
 .../rpc/protocol/rest/PathAndInvokerMapper.java    | 42 +++++++++-------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java
 
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java
index bf4bcb225b..9f3a5c478b 100644
--- 
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java
+++ 
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java
@@ -53,18 +53,17 @@ public class PathAndInvokerMapper {
      */
     public void addPathAndInvoker(Map<PathMatcher, RestMethodMetadata> 
metadataMap, Invoker invoker) {
 
-        metadataMap.entrySet().stream().forEach(entry -> {
-            PathMatcher pathMatcher = entry.getKey();
+        metadataMap.forEach((pathMatcher, value) -> {
             if (pathMatcher.hasPathVariable()) {
                 addPathMatcherToPathMap(
                         pathMatcher,
                         pathToServiceMapContainPathVariable,
-                        InvokerAndRestMethodMetadataPair.pair(invoker, 
entry.getValue()));
+                        InvokerAndRestMethodMetadataPair.pair(invoker, value));
             } else {
                 addPathMatcherToPathMap(
                         pathMatcher,
                         pathToServiceMapNoPathVariable,
-                        InvokerAndRestMethodMetadataPair.pair(invoker, 
entry.getValue()));
+                        InvokerAndRestMethodMetadataPair.pair(invoker, value));
             }
         });
     }
@@ -78,16 +77,14 @@ public class PathAndInvokerMapper {
     public InvokerAndRestMethodMetadataPair getRestMethodMetadata(PathMatcher 
pathMatcher) {
 
         // first search from pathToServiceMapNoPathVariable
-        if (pathToServiceMapNoPathVariable.containsKey(pathMatcher)) {
-            return pathToServiceMapNoPathVariable.get(pathMatcher);
+        InvokerAndRestMethodMetadataPair pair;
+        pair = pathToServiceMapNoPathVariable.get(pathMatcher);
+        if (pair == null) {
+            // second search from pathToServiceMapContainPathVariable
+            pair = pathToServiceMapContainPathVariable.get(pathMatcher);
         }
 
-        // second search from pathToServiceMapContainPathVariable
-        if (pathToServiceMapContainPathVariable.containsKey(pathMatcher)) {
-            return pathToServiceMapContainPathVariable.get(pathMatcher);
-        }
-
-        return null;
+        return pair;
     }
 
     /**
@@ -117,12 +114,10 @@ public class PathAndInvokerMapper {
             Map<PathMatcher, InvokerAndRestMethodMetadataPair> 
pathMatcherPairMap,
             InvokerAndRestMethodMetadataPair invokerRestMethodMetadataPair) {
 
-        if (pathMatcherPairMap.containsKey(pathMatcher)) {
-
-            // cover the old service metadata when  current interface is old 
interface & current method desc equals
+        InvokerAndRestMethodMetadataPair beforeMetadata = 
pathMatcherPairMap.get(pathMatcher);
+        if (beforeMetadata != null) {
+            // cover the old service metadata when current interface is old 
interface & current method desc equals
             // old`s method desc,else ,throw double check exception
-
-            InvokerAndRestMethodMetadataPair beforeMetadata = 
pathMatcherPairMap.get(pathMatcher);
             // true when reExport
             if 
(!invokerRestMethodMetadataPair.compareServiceMethod(beforeMetadata)) {
                 throw new DoublePathCheckException("dubbo rest double path 
check error, current path is: " + pathMatcher
@@ -145,15 +140,12 @@ public class PathAndInvokerMapper {
 
         PathMatcher newPathMatcher = 
PathMatcher.convertPathMatcher(pathMatcher);
 
-        if (!pathMatcherToHttpMethodMap.containsKey(newPathMatcher)) {
-            HashSet<String> httpMethods = new HashSet<>();
-
-            httpMethods.add(pathMatcher.getHttpMethod());
-
-            pathMatcherToHttpMethodMap.put(newPathMatcher, httpMethods);
-        }
+        Set<String> httpMethods = 
pathMatcherToHttpMethodMap.computeIfAbsent(newPathMatcher, k -> {
+            HashSet<String> methods = new HashSet<>();
 
-        Set<String> httpMethods = 
pathMatcherToHttpMethodMap.get(newPathMatcher);
+            methods.add(pathMatcher.getHttpMethod());
+            return methods;
+        });
 
         httpMethods.add(newPathMatcher.getHttpMethod());
     }