[dubbo] branch master updated: Fix the problem of ProtocolConfig requiring a name parameter in new versions of Dubbo (#7624)

[albumenj]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2201510  Fix the problem of ProtocolConfig requiring a name parameter 
in new versions of Dubbo (#7624)
2201510 is described below

commit 22015103f756d3edb0b3f658379ba4c402985488
Author: 张志勇 <goodj...@163.com>
AuthorDate: Sat May 1 12:57:02 2021 +0800

    Fix the problem of ProtocolConfig requiring a name parameter in new 
versions of Dubbo (#7624)
---
 .../DubboConfigDefaultPropertyValueBeanPostProcessor.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
index ec99c1c..8b75859 100644
--- 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
@@ -16,7 +16,9 @@
  */
 package org.apache.dubbo.config.spring.beans.factory.config;
 
+import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.config.AbstractConfig;
+import org.apache.dubbo.config.ProtocolConfig;
 
 import com.alibaba.spring.beans.factory.config.GenericBeanPostProcessorAdapter;
 import org.springframework.beans.BeansException;
@@ -54,7 +56,14 @@ public class 
DubboConfigDefaultPropertyValueBeanPostProcessor extends GenericBea
     protected void processBeforeInitialization(AbstractConfig dubboConfigBean, 
String beanName) throws BeansException {
         // [Feature] https://github.com/apache/dubbo/issues/5721
         setBeanNameAsDefaultValue(dubboConfigBean, "id", beanName);
-        setBeanNameAsDefaultValue(dubboConfigBean, "name", beanName);
+        if (dubboConfigBean instanceof ProtocolConfig) {
+            ProtocolConfig config = (ProtocolConfig) dubboConfigBean;
+            if (StringUtils.isEmpty(config.getName())) {
+                config.setName("dubbo");
+            }
+        } else {
+            setBeanNameAsDefaultValue(dubboConfigBean, "name", beanName);
+        }
     }
 
     @Override