root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-07-09 15:38:55 +02:00
parent 6b1fbc9fe1 b32b4f3a59
commit 0521cdda88
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
View File

@ -447,17 +447,17 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
} }
String canonicalName = canonicalName(beanName); String canonicalName = canonicalName(beanName);
Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName); Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName);
if (dependentBeans == null) { if (dependentBeans == null || dependentBeans.isEmpty()) {
return false; return false;
} }
if (dependentBeans.contains(dependentBeanName)) { if (dependentBeans.contains(dependentBeanName)) {
return true; return true;
} }
for (String transitiveDependency : dependentBeans) {
if (alreadySeen == null) { if (alreadySeen == null) {
alreadySeen = new HashSet<>(); alreadySeen = new HashSet<>();
} }
alreadySeen.add(beanName); alreadySeen.add(beanName);
for (String transitiveDependency : dependentBeans) {
if (isDependent(transitiveDependency, dependentBeanName, alreadySeen)) { if (isDependent(transitiveDependency, dependentBeanName, alreadySeen)) {
return true; return true;
} }

32
spring-beans/src/test/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,12 +28,13 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Chris Beams * @author Chris Beams
* @since 04.07.2006 * @since 04.07.2006
*/ */
public class DefaultSingletonBeanRegistryTests { class DefaultSingletonBeanRegistryTests {
private final DefaultSingletonBeanRegistry beanRegistry = new DefaultSingletonBeanRegistry();
@Test @Test
public void testSingletons() { void singletons() {
DefaultSingletonBeanRegistry beanRegistry = new DefaultSingletonBeanRegistry();
TestBean tb = new TestBean(); TestBean tb = new TestBean();
beanRegistry.registerSingleton("tb", tb); beanRegistry.registerSingleton("tb", tb);
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb); assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
@ -44,20 +45,15 @@ public class DefaultSingletonBeanRegistryTests {
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb); assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2); assertThat(beanRegistry.getSingleton("tb2")).isSameAs(tb2);
assertThat(beanRegistry.getSingletonCount()).isEqualTo(2); assertThat(beanRegistry.getSingletonCount()).isEqualTo(2);
String[] names = beanRegistry.getSingletonNames(); assertThat(beanRegistry.getSingletonNames()).containsExactly("tb", "tb2");
assertThat(names).hasSize(2);
assertThat(names[0]).isEqualTo("tb");
assertThat(names[1]).isEqualTo("tb2");
beanRegistry.destroySingletons(); beanRegistry.destroySingletons();
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0); assertThat(beanRegistry.getSingletonCount()).isZero();
assertThat(beanRegistry.getSingletonNames()).isEmpty(); assertThat(beanRegistry.getSingletonNames()).isEmpty();
} }
@Test @Test
public void testDisposableBean() { void disposableBean() {
DefaultSingletonBeanRegistry beanRegistry = new DefaultSingletonBeanRegistry();
DerivedTestBean tb = new DerivedTestBean(); DerivedTestBean tb = new DerivedTestBean();
beanRegistry.registerSingleton("tb", tb); beanRegistry.registerSingleton("tb", tb);
beanRegistry.registerDisposableBean("tb", tb); beanRegistry.registerDisposableBean("tb", tb);
@ -65,21 +61,17 @@ public class DefaultSingletonBeanRegistryTests {
assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb); assertThat(beanRegistry.getSingleton("tb")).isSameAs(tb);
assertThat(beanRegistry.getSingletonCount()).isEqualTo(1); assertThat(beanRegistry.getSingletonCount()).isEqualTo(1);
String[] names = beanRegistry.getSingletonNames(); assertThat(beanRegistry.getSingletonNames()).containsExactly("tb");
assertThat(names).hasSize(1);
assertThat(names[0]).isEqualTo("tb");
assertThat(tb.wasDestroyed()).isFalse(); assertThat(tb.wasDestroyed()).isFalse();
beanRegistry.destroySingletons(); beanRegistry.destroySingletons();
assertThat(beanRegistry.getSingletonCount()).isEqualTo(0); assertThat(beanRegistry.getSingletonCount()).isZero();
assertThat(beanRegistry.getSingletonNames()).isEmpty(); assertThat(beanRegistry.getSingletonNames()).isEmpty();
assertThat(tb.wasDestroyed()).isTrue(); assertThat(tb.wasDestroyed()).isTrue();
} }
@Test @Test
public void testDependentRegistration() { void dependentRegistration() {
DefaultSingletonBeanRegistry beanRegistry = new DefaultSingletonBeanRegistry();
beanRegistry.registerDependentBean("a", "b"); beanRegistry.registerDependentBean("a", "b");
beanRegistry.registerDependentBean("b", "c"); beanRegistry.registerDependentBean("b", "c");
beanRegistry.registerDependentBean("c", "b"); beanRegistry.registerDependentBean("c", "b");