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

Polishing

This commit is contained in:
Juergen Hoeller 2023-07-24 11:21:13 +02:00
parent 5bcf5c6f7c
commit fdf1418dfb
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@ -1370,8 +1370,8 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("rod2", bd2); lbf.registerBeanDefinition("rod2", bd2);
lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer()); lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() -> assertThatExceptionOfType(UnsatisfiedDependencyException.class)
lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false)) .isThrownBy(() -> lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false))
.withMessageContaining("rod") .withMessageContaining("rod")
.withMessageContaining("rod2"); .withMessageContaining("rod2");
} }
@ -1441,8 +1441,8 @@ class DefaultListableBeanFactoryTests {
bd2.setDependsOn("tb1"); bd2.setDependsOn("tb1");
lbf.registerBeanDefinition("tb2", bd2); lbf.registerBeanDefinition("tb2", bd2);
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> assertThatExceptionOfType(BeanCreationException.class)
lbf.preInstantiateSingletons()) .isThrownBy(() -> lbf.preInstantiateSingletons())
.withMessageContaining("Circular") .withMessageContaining("Circular")
.withMessageContaining("'tb2'") .withMessageContaining("'tb2'")
.withMessageContaining("'tb1'"); .withMessageContaining("'tb1'");
@ -1460,8 +1460,8 @@ class DefaultListableBeanFactoryTests {
bd3.setDependsOn("tb1"); bd3.setDependsOn("tb1");
lbf.registerBeanDefinition("tb3", bd3); lbf.registerBeanDefinition("tb3", bd3);
assertThatExceptionOfType(BeanCreationException.class).isThrownBy( assertThatExceptionOfType(BeanCreationException.class)
lbf::preInstantiateSingletons) .isThrownBy(lbf::preInstantiateSingletons)
.withMessageContaining("Circular") .withMessageContaining("Circular")
.withMessageContaining("'tb3'") .withMessageContaining("'tb3'")
.withMessageContaining("'tb1'"); .withMessageContaining("'tb1'");
@ -1607,8 +1607,8 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("bd1", bd1); lbf.registerBeanDefinition("bd1", bd1);
lbf.registerBeanDefinition("bd2", bd2); lbf.registerBeanDefinition("bd2", bd2);
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(() -> assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
lbf.getBean(TestBean.class)) .isThrownBy(() -> lbf.getBean(TestBean.class))
.withMessageContaining("Multiple beans found with the same priority") .withMessageContaining("Multiple beans found with the same priority")
.withMessageContaining("5"); // conflicting priority .withMessageContaining("5"); // conflicting priority
} }
@ -1815,8 +1815,8 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("bd1", bd1); lbf.registerBeanDefinition("bd1", bd1);
lbf.registerBeanDefinition("bd2", bd2); lbf.registerBeanDefinition("bd2", bd2);
assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(() -> assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
lbf.getBean(ConstructorDependency.class, 42)) .isThrownBy(() -> lbf.getBean(ConstructorDependency.class, 42))
.withMessageContaining("more than one 'primary'"); .withMessageContaining("more than one 'primary'");
} }
@ -2004,8 +2004,8 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("test", bd); lbf.registerBeanDefinition("test", bd);
lbf.registerBeanDefinition("spouse", bd2); lbf.registerBeanDefinition("spouse", bd2);
assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() -> assertThatExceptionOfType(UnsatisfiedDependencyException.class)
lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true)) .isThrownBy(() -> lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
.withMessageContaining("test") .withMessageContaining("test")
.withMessageContaining("spouse"); .withMessageContaining("spouse");
} }
@ -2071,8 +2071,8 @@ class DefaultListableBeanFactoryTests {
lbf.registerBeanDefinition("test", bd); lbf.registerBeanDefinition("test", bd);
lbf.registerBeanDefinition("spouse", bd2); lbf.registerBeanDefinition("spouse", bd2);
assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() -> assertThatExceptionOfType(UnsatisfiedDependencyException.class)
lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true)) .isThrownBy(() -> lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
.withCauseExactlyInstanceOf(NoUniqueBeanDefinitionException.class) .withCauseExactlyInstanceOf(NoUniqueBeanDefinitionException.class)
.withMessageContaining("5"); .withMessageContaining("5");
} }
@ -2337,8 +2337,8 @@ class DefaultListableBeanFactoryTests {
void beanDefinitionWithInterface() { void beanDefinitionWithInterface() {
lbf.registerBeanDefinition("test", new RootBeanDefinition(ITestBean.class)); lbf.registerBeanDefinition("test", new RootBeanDefinition(ITestBean.class));
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> assertThatExceptionOfType(BeanCreationException.class)
lbf.getBean("test")) .isThrownBy(() -> lbf.getBean("test"))
.withMessageContaining("interface") .withMessageContaining("interface")
.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test")); .satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
} }
@ -2347,8 +2347,8 @@ class DefaultListableBeanFactoryTests {
void beanDefinitionWithAbstractClass() { void beanDefinitionWithAbstractClass() {
lbf.registerBeanDefinition("test", new RootBeanDefinition(AbstractBeanFactory.class)); lbf.registerBeanDefinition("test", new RootBeanDefinition(AbstractBeanFactory.class));
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> assertThatExceptionOfType(BeanCreationException.class)
lbf.getBean("test")) .isThrownBy(() -> lbf.getBean("test"))
.withMessageContaining("abstract") .withMessageContaining("abstract")
.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test")); .satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
} }

3
spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java
View File

@ -29,7 +29,8 @@ import org.springframework.util.NumberUtils;
/** /**
* Miscellaneous utility methods for DAO implementations. * Miscellaneous utility methods for DAO implementations.
* Useful with any data access technology. *
* <p>Useful with any data access technology.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 1.0.2 * @since 1.0.2