Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: modify non-standard naming #13059

Merged
merged 3 commits into from
Sep 25, 2023
Merged

refactor: modify non-standard naming #13059

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a1155e
refactor: modify non-standard naming
zgliu201609 Sep 15, 2023
835c7a2
Merge branch '3.3' into 3.3
AlbumenJ Sep 19, 2023
b2d0448
Merge branch '3.3' into 3.3
liuzg-coder Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...g-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboSpringInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
}
Expand All @@ -54,7 +54,7 @@ public static void initialize(BeanDefinitionRegistry registry) {
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;
}

Expand All @@ -66,18 +66,18 @@ public static void initialize(BeanDefinitionRegistry registry) {
}

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;
Expand All @@ -87,11 +87,11 @@ public static boolean remove(ApplicationContext springContext) {
}

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;
}
Expand Down Expand Up @@ -184,7 +184,7 @@ private static void registerSingleton(ConfigurableListableBeanFactory beanFactor
}

private static DubboSpringInitContext findContextForApplication(ApplicationModel applicationModel) {
for (DubboSpringInitContext initializationContext : contextMap.values()) {
for (DubboSpringInitContext initializationContext : REGISTRY_CONTEXT_MAP.values()) {
if (initializationContext.getApplicationModel() == applicationModel) {
return initializationContext;
}
Expand Down