fix getAttchments return copy map problem. (#9571)

apache · Jan 29, 2022 · 7aa6ea2 · 7aa6ea2
1 parent 01a0d55
commit 7aa6ea2
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 93 deletions.
diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/MockDirInvocation.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/MockDirInvocation.java
@@ -16,17 +16,19 @@
  */
 package org.apache.dubbo.rpc.cluster.directory;
 
+import org.apache.dubbo.rpc.AttachmentsAdapter;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_VERSION_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.TIMEOUT_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
-import org.apache.dubbo.common.utils.MapUtils;
 import static org.apache.dubbo.rpc.Constants.TOKEN_KEY;
-import org.apache.dubbo.rpc.Invocation;
-import org.apache.dubbo.rpc.Invoker;
 
 /**
  * MockInvocation.java
@@ -73,7 +75,7 @@ public Object[] getArguments() {
     }
 
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(attachments);
+        return new AttachmentsAdapter.ObjectToStringMap(attachments);
     }
 
     @Override
@@ -88,7 +90,7 @@ public void setAttachment(String key, String value) {
 
     @Override
     public void setAttachment(String key, Object value) {
-        setObjectAttachment(key, value);
+       setObjectAttachment(key, value);
     }
 
     @Override

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/MapUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/MapUtils.java
diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/service/MockInvocation.java b/dubbo-compatible/src/test/java/org/apache/dubbo/service/MockInvocation.java
@@ -16,7 +16,7 @@
  */
 package org.apache.dubbo.service;
 
-import org.apache.dubbo.common.utils.MapUtils;
+import org.apache.dubbo.rpc.AttachmentsAdapter;
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 
@@ -79,7 +79,7 @@ public Object[] getArguments() {
     }
 
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(attachments);
+        return new AttachmentsAdapter.ObjectToStringMap(attachments);
     }
 
     @Override

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AppResponse.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.rpc;
 
 
-import org.apache.dubbo.common.utils.MapUtils;
 import org.apache.dubbo.rpc.proxy.InvokerInvocationHandler;
 
 import java.util.HashMap;
@@ -122,7 +121,7 @@ public boolean hasException() {
     @Override
     @Deprecated
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(attachments);
+        return new AttachmentsAdapter.ObjectToStringMap(attachments);
     }
 
     @Override

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
@@ -22,18 +22,12 @@
 /**
  * This class provides map adapters to support attachments in RpcContext, Invocation and Result switch from
  * <String, String> to <String, Object>
- *
- * please use {@link org.apache.dubbo.common.utils.MapUtils}
- *
  */
-@Deprecated
 public class AttachmentsAdapter {
 
-    @Deprecated
     public static class ObjectToStringMap extends HashMap<String, String> {
         private Map<String, Object> attachments;
 
-        @Deprecated
         public ObjectToStringMap(Map<String, Object> attachments) {
             for (Entry<String, Object> entry : attachments.entrySet()) {
                 String convertResult = convert(entry.getValue());
@@ -57,11 +51,10 @@ public String remove(Object key) {
         }
 
         private String convert(Object obj) {
-            if (obj == null) {
-                return null;
-            } else {
-                return obj.toString();
+            if (obj instanceof String) {
+                return (String) obj;
             }
+            return null; // or JSON.toString(obj);
         }
 
         @Override

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java
@@ -20,7 +20,6 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.threadlocal.InternalThreadLocal;
 import org.apache.dubbo.common.utils.CollectionUtils;
-import org.apache.dubbo.common.utils.MapUtils;
 import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 
@@ -547,15 +546,13 @@ public RpcContext removeAttachment(String key) {
     }
 
     /**
-     * get String type attachments.
-     *
-     * Best to use {{@link #getObjectAttachments()}}
+     * get attachments.
      *
      * @return attachments
      */
     @Deprecated
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(this.getObjectAttachments());
+        return new AttachmentsAdapter.ObjectToStringMap(this.getObjectAttachments());
     }
 
     /**

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
@@ -17,7 +17,6 @@
 package org.apache.dubbo.rpc;
 
 import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.utils.MapUtils;
 import org.apache.dubbo.common.utils.ReflectUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -278,7 +277,7 @@ public void setAttachment(String key, String value) {
     @Deprecated
     @Override
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(attachments);
+        return new AttachmentsAdapter.ObjectToStringMap(attachments);
     }
 
     @Deprecated

diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java
@@ -117,6 +117,9 @@ public void testObjectAttachment() {
         Assertions.assertEquals(1, response.getObjectAttachment("objectKey3"));
         Assertions.assertEquals(3, response.getObjectAttachments().size());
 
+        response.getAttachments().put("objectKey4", "value4");
+        Assertions.assertEquals(response.getAttachment("objectKey4"), "value4");
+
         HashMap<String, Object> map = new HashMap<>();
         map.put("mapKey1", 1);
         map.put("mapKey2", "mapValue2");

diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java
@@ -108,8 +108,13 @@ public void testAttachments() {
         Assertions.assertNull(context.getAttachment("_33"));
         Assertions.assertEquals("3333", context.getAttachment(".33"));
 
+        context.getAttachments().put("44", "4444");
+        Assertions.assertEquals(context.getAttachment("44"), "4444");
+
         context.clearAttachments();
         Assertions.assertNull(context.getAttachment("_11"));
+
+
     }
 
     @Test

diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcInvocationTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcInvocationTest.java
@@ -37,6 +37,10 @@ public void testAttachment() {
         Assertions.assertEquals(1, invocation.getObjectAttachment("objectKey3"));
         Assertions.assertEquals(3, invocation.getObjectAttachments().size());
 
+        invocation.getAttachments().put("object4", "value4");
+        Assertions.assertEquals(invocation.getAttachment("object4"), "value4");
+
+
         HashMap<String, Object> map = new HashMap<>();
         map.put("mapKey1", 1);
         map.put("mapKey2", "mapValue2");

diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvocation.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvocation.java
@@ -16,7 +16,7 @@
  */
 package org.apache.dubbo.rpc.support;
 
-import org.apache.dubbo.common.utils.MapUtils;
+import org.apache.dubbo.rpc.AttachmentsAdapter;
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 
@@ -75,7 +75,7 @@ public Object[] getArguments() {
     }
 
     public Map<String, String> getAttachments() {
-        return MapUtils.objectToStringMap(attachments);
+        return new AttachmentsAdapter.ObjectToStringMap(attachments);
     }
 
     @Override