@@ -43,103 +43,103 @@ public class BeanRegistryAdapterTests {
43
43
44
44
@ Test
45
45
void defaultBackgroundInit () {
46
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
46
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
47
47
new DefaultBeanRegistrar ().register (adapter , env );
48
48
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
49
49
assertThat (beanDefinition .isBackgroundInit ()).isFalse ();
50
50
}
51
51
52
52
@ Test
53
53
void enableBackgroundInit () {
54
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , BackgroundInitBeanRegistrar .class );
54
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , BackgroundInitBeanRegistrar .class );
55
55
new BackgroundInitBeanRegistrar ().register (adapter , env );
56
56
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
57
57
assertThat (beanDefinition .isBackgroundInit ()).isTrue ();
58
58
}
59
59
60
60
@ Test
61
61
void defaultDescription () {
62
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
62
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
63
63
new DefaultBeanRegistrar ().register (adapter , env );
64
64
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
65
65
assertThat (beanDefinition .getDescription ()).isNull ();
66
66
}
67
67
68
68
@ Test
69
69
void customDescription () {
70
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , CustomDescriptionBeanRegistrar .class );
70
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , CustomDescriptionBeanRegistrar .class );
71
71
new CustomDescriptionBeanRegistrar ().register (adapter , env );
72
72
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
73
73
assertThat (beanDefinition .getDescription ()).isEqualTo ("custom" );
74
74
}
75
75
76
76
@ Test
77
77
void defaultFallback () {
78
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
78
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
79
79
new DefaultBeanRegistrar ().register (adapter , env );
80
80
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
81
81
assertThat (beanDefinition .isFallback ()).isFalse ();
82
82
}
83
83
84
84
@ Test
85
85
void enableFallback () {
86
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , FallbackBeanRegistrar .class );
86
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , FallbackBeanRegistrar .class );
87
87
new FallbackBeanRegistrar ().register (adapter , env );
88
88
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
89
89
assertThat (beanDefinition .isFallback ()).isTrue ();
90
90
}
91
91
92
92
@ Test
93
93
void defaultRole () {
94
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
94
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
95
95
new DefaultBeanRegistrar ().register (adapter , env );
96
96
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
97
97
assertThat (beanDefinition .getRole ()).isEqualTo (AbstractBeanDefinition .ROLE_APPLICATION );
98
98
}
99
99
100
100
@ Test
101
101
void infrastructureRole () {
102
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , InfrastructureBeanRegistrar .class );
102
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , InfrastructureBeanRegistrar .class );
103
103
new InfrastructureBeanRegistrar ().register (adapter , env );
104
104
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
105
105
assertThat (beanDefinition .getRole ()).isEqualTo (AbstractBeanDefinition .ROLE_INFRASTRUCTURE );
106
106
}
107
107
108
108
@ Test
109
109
void defaultLazyInit () {
110
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
110
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
111
111
new DefaultBeanRegistrar ().register (adapter , env );
112
112
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
113
113
assertThat (beanDefinition .isLazyInit ()).isFalse ();
114
114
}
115
115
116
116
@ Test
117
117
void enableLazyInit () {
118
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , LazyInitBeanRegistrar .class );
118
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , LazyInitBeanRegistrar .class );
119
119
new LazyInitBeanRegistrar ().register (adapter , env );
120
120
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
121
121
assertThat (beanDefinition .isLazyInit ()).isTrue ();
122
122
}
123
123
124
124
@ Test
125
125
void defaultAutowirable () {
126
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
126
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
127
127
new DefaultBeanRegistrar ().register (adapter , env );
128
128
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
129
129
assertThat (beanDefinition .isAutowireCandidate ()).isTrue ();
130
130
}
131
131
132
132
@ Test
133
133
void notAutowirable () {
134
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , NotAutowirableBeanRegistrar .class );
134
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , NotAutowirableBeanRegistrar .class );
135
135
new NotAutowirableBeanRegistrar ().register (adapter , env );
136
136
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
137
137
assertThat (beanDefinition .isAutowireCandidate ()).isFalse ();
138
138
}
139
139
140
140
@ Test
141
141
void defaultOrder () {
142
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
142
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
143
143
new DefaultBeanRegistrar ().register (adapter , env );
144
144
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
145
145
Integer order = (Integer )beanDefinition .getAttribute (AbstractBeanDefinition .ORDER_ATTRIBUTE );
@@ -148,7 +148,7 @@ void defaultOrder() {
148
148
149
149
@ Test
150
150
void customOrder () {
151
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , CustomOrderBeanRegistrar .class );
151
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , CustomOrderBeanRegistrar .class );
152
152
new CustomOrderBeanRegistrar ().register (adapter , env );
153
153
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition ) this .beanFactory .getBeanDefinition ("foo" );
154
154
Integer order = (Integer )beanDefinition .getAttribute (AbstractBeanDefinition .ORDER_ATTRIBUTE );
@@ -157,47 +157,47 @@ void customOrder() {
157
157
158
158
@ Test
159
159
void defaultPrimary () {
160
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
160
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
161
161
new DefaultBeanRegistrar ().register (adapter , env );
162
162
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
163
163
assertThat (beanDefinition .isPrimary ()).isFalse ();
164
164
}
165
165
166
166
@ Test
167
167
void enablePrimary () {
168
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , PrimaryBeanRegistrar .class );
168
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , PrimaryBeanRegistrar .class );
169
169
new PrimaryBeanRegistrar ().register (adapter , env );
170
170
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
171
171
assertThat (beanDefinition .isPrimary ()).isTrue ();
172
172
}
173
173
174
174
@ Test
175
175
void defaultScope () {
176
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
176
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
177
177
new DefaultBeanRegistrar ().register (adapter , env );
178
178
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
179
179
assertThat (beanDefinition .getScope ()).isEqualTo (AbstractBeanDefinition .SCOPE_DEFAULT );
180
180
}
181
181
182
182
@ Test
183
183
void prototypeScope () {
184
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , PrototypeBeanRegistrar .class );
184
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , PrototypeBeanRegistrar .class );
185
185
new PrototypeBeanRegistrar ().register (adapter , env );
186
186
BeanDefinition beanDefinition = this .beanFactory .getBeanDefinition ("foo" );
187
187
assertThat (beanDefinition .getScope ()).isEqualTo (AbstractBeanDefinition .SCOPE_PROTOTYPE );
188
188
}
189
189
190
190
@ Test
191
191
void defaultSupplier () {
192
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , DefaultBeanRegistrar .class );
192
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , DefaultBeanRegistrar .class );
193
193
new DefaultBeanRegistrar ().register (adapter , env );
194
194
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition )this .beanFactory .getBeanDefinition ("foo" );
195
195
assertThat (beanDefinition .getInstanceSupplier ()).isNull ();
196
196
}
197
197
198
198
@ Test
199
199
void customSupplier () {
200
- BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , SupplierBeanRegistrar .class );
200
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this . env , SupplierBeanRegistrar .class );
201
201
new SupplierBeanRegistrar ().register (adapter , env );
202
202
AbstractBeanDefinition beanDefinition = (AbstractBeanDefinition )this .beanFactory .getBeanDefinition ("foo" );
203
203
Supplier <?> supplier = beanDefinition .getInstanceSupplier ();
@@ -221,6 +221,14 @@ void customTargetTypeFromTypeReference() {
221
221
assertThat (beanDefinition .getResolvableType ().resolveGeneric (0 )).isEqualTo (Foo .class );
222
222
}
223
223
224
+ @ Test
225
+ void registerViaAnotherRegistrar () {
226
+ BeanRegistryAdapter adapter = new BeanRegistryAdapter (this .beanFactory , this .beanFactory , this .env , DefaultBeanRegistrar .class );
227
+ BeanRegistrar registrar = (registry , env ) -> registry .register (new DefaultBeanRegistrar ());
228
+ registrar .register (adapter , env );
229
+ assertThat (this .beanFactory .getBeanDefinition ("foo" )).isNotNull ();
230
+ }
231
+
224
232
225
233
private static class DefaultBeanRegistrar implements BeanRegistrar {
226
234
0 commit comments