[dubbo] branch 3.3 updated: refactor: modify non-standard naming (#13059)

[albumenj]

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

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


The following commit(s) were added to refs/heads/3.3 by this push:
     new 0fd51b1ca0 refactor: modify non-standard naming (#13059)
0fd51b1ca0 is described below

commit 0fd51b1ca05fa91156ed7817b68cb800628b39a3
Author: lazy <65394407+liuzg-co...@users.noreply.github.com>
AuthorDate: Mon Sep 25 19:35:01 2023 +0800

    refactor: modify non-standard naming (#13059)
    
    Co-authored-by: liuzhigang <liu...@asiainfo.com>
    Co-authored-by: Albumen Kevin <jhq0...@gmail.com>
---
 .../config/spring/context/DubboSpringInitializer.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboSpringInitializer.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboSpringInitializer.java
index 7f79c7223a..8dc1a97930 100644
--- 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboSpringInitializer.java
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboSpringInitializer.java
@@ -43,7 +43,7 @@ public class DubboSpringInitializer {
 
     private static final Logger logger = 
LoggerFactory.getLogger(DubboSpringInitializer.class);
 
-    private static final Map<BeanDefinitionRegistry, DubboSpringInitContext> 
contextMap = new ConcurrentHashMap<>();
+    private static final Map<BeanDefinitionRegistry, DubboSpringInitContext> 
REGISTRY_CONTEXT_MAP = new ConcurrentHashMap<>();
 
     public DubboSpringInitializer() {
     }
@@ -54,7 +54,7 @@ public class DubboSpringInitializer {
         DubboSpringInitContext context = new DubboSpringInitContext();
 
         // Spring ApplicationContext may not ready at this moment (e.g. load 
from xml), so use registry as key
-        if (contextMap.putIfAbsent(registry, context) != null) {
+        if (REGISTRY_CONTEXT_MAP.putIfAbsent(registry, context) != null) {
             return;
         }
 
@@ -66,18 +66,18 @@ public class DubboSpringInitializer {
     }
 
     public static boolean remove(BeanDefinitionRegistry registry) {
-        return contextMap.remove(registry) != null;
+        return REGISTRY_CONTEXT_MAP.remove(registry) != null;
     }
 
     public static boolean remove(ApplicationContext springContext) {
         AutowireCapableBeanFactory autowireCapableBeanFactory = 
springContext.getAutowireCapableBeanFactory();
-        for (Map.Entry<BeanDefinitionRegistry, DubboSpringInitContext> entry : 
contextMap.entrySet()) {
+        for (Map.Entry<BeanDefinitionRegistry, DubboSpringInitContext> entry : 
REGISTRY_CONTEXT_MAP.entrySet()) {
             DubboSpringInitContext initContext = entry.getValue();
             if (initContext.getApplicationContext() == springContext ||
                 initContext.getBeanFactory() == autowireCapableBeanFactory ||
                 initContext.getRegistry() == autowireCapableBeanFactory
             ) {
-                DubboSpringInitContext context = 
contextMap.remove(entry.getKey());
+                DubboSpringInitContext context = 
REGISTRY_CONTEXT_MAP.remove(entry.getKey());
                 logger.info("Unbind " + 
safeGetModelDesc(context.getModuleModel()) + " from spring container: " +
                     ObjectUtils.identityToString(entry.getKey()));
                 return true;
@@ -87,11 +87,11 @@ public class DubboSpringInitializer {
     }
 
     static Map<BeanDefinitionRegistry, DubboSpringInitContext> getContextMap() 
{
-        return contextMap;
+        return REGISTRY_CONTEXT_MAP;
     }
 
     static DubboSpringInitContext findBySpringContext(ApplicationContext 
applicationContext) {
-        for (DubboSpringInitContext initContext : contextMap.values()) {
+        for (DubboSpringInitContext initContext : 
REGISTRY_CONTEXT_MAP.values()) {
             if (initContext.getApplicationContext() == applicationContext) {
                 return initContext;
             }
@@ -184,7 +184,7 @@ public class DubboSpringInitializer {
     }
 
     private static DubboSpringInitContext 
findContextForApplication(ApplicationModel applicationModel) {
-        for (DubboSpringInitContext initializationContext : 
contextMap.values()) {
+        for (DubboSpringInitContext initializationContext : 
REGISTRY_CONTEXT_MAP.values()) {
             if (initializationContext.getApplicationModel() == 
applicationModel) {
                 return initializationContext;
             }