Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nested configuration class introspection check on concrete class

Browse Source 
Issue: SPR-16839
This commit is contained in:
Juergen Hoeller
2018-09-17 19:09:55 +02:00
parent c8869d99f5
commit 0948edb39d
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -201,6 +201,27 @@ public class NestedConfigurationClassTests {
assertNotEquals(l2i1.toString(), l2i2.toString());
}
@Test
public void twoLevelsOnNonAnnotatedBaseClass() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
ctx.register(L0ConfigConcrete.class);
ctx.refresh();
assertFalse(ctx.getBeanFactory().containsSingleton("l0ConfigConcrete"));
Object l0i1 = ctx.getBean(L0ConfigConcrete.class);
Object l0i2 = ctx.getBean(L0ConfigConcrete.class);
assertTrue(l0i1 == l0i2);
Object l1i1 = ctx.getBean(L0ConfigConcrete.L1ConfigEmpty.class);
Object l1i2 = ctx.getBean(L0ConfigConcrete.L1ConfigEmpty.class);
assertTrue(l1i1 != l1i2);
Object l2i1 = ctx.getBean(L0ConfigConcrete.L1ConfigEmpty.L2ConfigEmpty.class);
Object l2i2 = ctx.getBean(L0ConfigConcrete.L1ConfigEmpty.L2ConfigEmpty.class);
assertTrue(l2i1 == l2i2);
assertNotEquals(l2i1.toString(), l2i2.toString());
}
@Configuration
@Lazy
@@ -365,4 +386,24 @@ public class NestedConfigurationClassTests {
}
}
static class L0ConfigBase {
@Component
@Scope("prototype")
static class L1ConfigEmpty {
@Component
@Scope(value = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
protected static class L2ConfigEmpty {
}
}
}
@Component
@Lazy
static class L0ConfigConcrete extends L0ConfigBase {
}
}