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

Polish contribution 

See gh-33401
This commit is contained in:
Sam Brannen 2024-08-18 14:58:05 +02:00
parent 4ffeddb099
commit 346b6f740a
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java
View File

@ -89,7 +89,7 @@ class ControllerAdviceBeanTests {
@Test @Test
void equalsHashCodeAndToString() { void equalsHashCodeAndToString() {
String beanName = getSingletonBeanName(SimpleControllerAdvice.class); String beanName = SimpleControllerAdvice.class.getSimpleName();
ControllerAdviceBean bean1 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class); ControllerAdviceBean bean1 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class);
ControllerAdviceBean bean2 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class); ControllerAdviceBean bean2 = createSingletonControllerAdviceBean(SimpleControllerAdvice.class);
assertEqualsHashCodeAndToString(bean1, bean2, beanName); assertEqualsHashCodeAndToString(bean1, bean2, beanName);
@ -113,8 +113,9 @@ class ControllerAdviceBeanTests {
@Test @Test
void resolveBeanForSingletonBean() { void resolveBeanForSingletonBean() {
String beanName = SimpleControllerAdvice.class.getSimpleName();
ControllerAdviceBean cab = createSingletonControllerAdviceBean(SimpleControllerAdvice.class); ControllerAdviceBean cab = createSingletonControllerAdviceBean(SimpleControllerAdvice.class);
Object bean = this.applicationContext.getBean(getSingletonBeanName(SimpleControllerAdvice.class)); Object bean = this.applicationContext.getBean(beanName);
assertThat(cab).extracting("resolvedBean").isNull(); assertThat(cab).extracting("resolvedBean").isNull();
Object resolvedBean = cab.resolveBean(); Object resolvedBean = cab.resolveBean();
assertThat(cab).extracting("resolvedBean").isEqualTo(bean); assertThat(cab).extracting("resolvedBean").isEqualTo(bean);
@ -122,7 +123,7 @@ class ControllerAdviceBeanTests {
} }
@Test @Test
void resolveBeanForNonSingletonBean() { void resolveBeanForPrototypeBean() {
ControllerAdviceBean cab = createPrototypeControllerAdviceBean(SimpleControllerAdvice.class); ControllerAdviceBean cab = createPrototypeControllerAdviceBean(SimpleControllerAdvice.class);
assertThat(cab).extracting("resolvedBean").isNull(); assertThat(cab).extracting("resolvedBean").isNull();
Object resolvedBean = cab.resolveBean(); Object resolvedBean = cab.resolveBean();
@ -220,27 +221,19 @@ class ControllerAdviceBeanTests {
} }
private ControllerAdviceBean createSingletonControllerAdviceBean(Class<?> beanType) { private ControllerAdviceBean createSingletonControllerAdviceBean(Class<?> beanType) {
String beanName = getSingletonBeanName(beanType); String beanName = beanType.getSimpleName();
this.applicationContext.registerSingleton(beanName, beanType); this.applicationContext.registerSingleton(beanName, beanType);
ControllerAdvice controllerAdvice = AnnotatedElementUtils.findMergedAnnotation(beanType, ControllerAdvice.class); ControllerAdvice controllerAdvice = AnnotatedElementUtils.findMergedAnnotation(beanType, ControllerAdvice.class);
return new ControllerAdviceBean(beanName, this.applicationContext, controllerAdvice); return new ControllerAdviceBean(beanName, this.applicationContext, controllerAdvice);
} }
private static String getSingletonBeanName(Class<?> beanType) {
return beanType.getSimpleName() + "Singleton";
}
private ControllerAdviceBean createPrototypeControllerAdviceBean(Class<?> beanType) { private ControllerAdviceBean createPrototypeControllerAdviceBean(Class<?> beanType) {
String beanName = getPrototypeBeanName(beanType); String beanName = beanType.getSimpleName();
this.applicationContext.registerPrototype(beanName, beanType); this.applicationContext.registerPrototype(beanName, beanType);
ControllerAdvice controllerAdvice = AnnotatedElementUtils.findMergedAnnotation(beanType, ControllerAdvice.class); ControllerAdvice controllerAdvice = AnnotatedElementUtils.findMergedAnnotation(beanType, ControllerAdvice.class);
return new ControllerAdviceBean(beanName, this.applicationContext, controllerAdvice); return new ControllerAdviceBean(beanName, this.applicationContext, controllerAdvice);
} }
private static String getPrototypeBeanName(Class<?> beanType) {
return beanType.getSimpleName() + "Prototype";
}
private void assertEqualsHashCodeAndToString(ControllerAdviceBean bean1, ControllerAdviceBean bean2, String toString) { private void assertEqualsHashCodeAndToString(ControllerAdviceBean bean1, ControllerAdviceBean bean2, String toString) {
assertThat(bean1).isEqualTo(bean2); assertThat(bean1).isEqualTo(bean2);
assertThat(bean2).isEqualTo(bean1); assertThat(bean2).isEqualTo(bean1);