|
40 | 40 | import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
41 | 41 | import org.springframework.beans.factory.config.BeanDefinition;
|
42 | 42 | import org.springframework.beans.factory.config.ConstructorArgumentValues;
|
43 |
| -import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; |
44 | 43 | import org.springframework.beans.factory.config.RuntimeBeanReference;
|
45 | 44 | import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
46 | 45 | import org.springframework.beans.factory.support.GenericBeanDefinition;
|
47 | 46 | import org.springframework.context.support.GenericApplicationContext;
|
| 47 | +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; |
48 | 48 | import org.springframework.context.support.SimpleThreadScope;
|
49 | 49 | import org.springframework.core.env.MutablePropertySources;
|
50 | 50 | import org.springframework.mock.env.MockPropertySource;
|
@@ -305,7 +305,7 @@ void testScanWithExplicitSqlSessionFactoryViaPlaceholder() {
|
305 | 305 | props.put("sqlSessionFactoryBeanNameProperty", "sqlSessionFactory2");
|
306 | 306 |
|
307 | 307 | GenericBeanDefinition propertyDefinition = new GenericBeanDefinition();
|
308 |
| - propertyDefinition.setBeanClass(PropertyPlaceholderConfigurer.class); |
| 308 | + propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); |
309 | 309 | propertyDefinition.getPropertyValues().add("properties", props);
|
310 | 310 |
|
311 | 311 | applicationContext.registerBeanDefinition("propertiesPlaceholder", propertyDefinition);
|
@@ -355,7 +355,7 @@ void testScanWithPropertyPlaceholders() {
|
355 | 355 | props.put("mybatis.lazy-initialization", "true");
|
356 | 356 |
|
357 | 357 | GenericBeanDefinition propertyDefinition = new GenericBeanDefinition();
|
358 |
| - propertyDefinition.setBeanClass(PropertyPlaceholderConfigurer.class); |
| 358 | + propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); |
359 | 359 | propertyDefinition.getPropertyValues().add("properties", props);
|
360 | 360 |
|
361 | 361 | applicationContext.registerBeanDefinition("propertiesPlaceholder", propertyDefinition);
|
|
0 commit comments