Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
0f0aa46e
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0f0aa46e
编写于
3月 28, 2017
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Delete unnecessary PropertySourcesPlaceholderConfigurer beans
Issue: SPR-14140
上级
7a01771a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
23 deletion
+4
-23
spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java
...ertiesOverridePropertiesFilesTestPropertySourceTests.java
+1
-8
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/TestConfig.java
...pringframework/test/context/junit/jupiter/TestConfig.java
+1
-7
spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/PropertySourcesInitializerTests.java
...unit4/aci/annotation/PropertySourcesInitializerTests.java
+2
-8
未找到文件。
spring-test/src/test/java/org/springframework/test/context/env/InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests.java
浏览文件 @
0f0aa46e
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -21,9 +21,7 @@ import org.junit.runner.RunWith;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.support.PropertySourcesPlaceholderConfigurer
;
import
org.springframework.core.env.Environment
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.TestPropertySource
;
...
...
@@ -59,11 +57,6 @@ public class InlinedPropertiesOverridePropertiesFilesTestPropertySourceTests {
@Configuration
static
class
Config
{
@Bean
public
static
PropertySourcesPlaceholderConfigurer
placeholderConfigurer
()
{
return
new
PropertySourcesPlaceholderConfigurer
();
}
}
}
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/TestConfig.java
浏览文件 @
0f0aa46e
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -19,7 +19,6 @@ package org.springframework.test.context.junit.jupiter;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.support.PropertySourcesPlaceholderConfigurer
;
import
org.springframework.test.context.junit.jupiter.comics.Cat
;
import
org.springframework.test.context.junit.jupiter.comics.Dog
;
import
org.springframework.test.context.junit.jupiter.comics.Person
;
...
...
@@ -33,11 +32,6 @@ import org.springframework.test.context.junit.jupiter.comics.Person;
@Configuration
public
class
TestConfig
{
@Bean
static
PropertySourcesPlaceholderConfigurer
placeholderConfigurer
()
{
return
new
PropertySourcesPlaceholderConfigurer
();
}
@Bean
Person
dilbert
()
{
return
new
Person
(
"Dilbert"
);
...
...
spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/PropertySourcesInitializerTests.java
浏览文件 @
0f0aa46e
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
7
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.
...
...
@@ -25,7 +25,6 @@ import org.springframework.context.ApplicationContextInitializer;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.support.PropertySourcesPlaceholderConfigurer
;
import
org.springframework.core.env.PropertySource
;
import
org.springframework.mock.env.MockPropertySource
;
import
org.springframework.test.context.ContextConfiguration
;
...
...
@@ -48,8 +47,7 @@ public class PropertySourcesInitializerTests {
static
class
Config
{
@Value
(
"${enigma}"
)
// If the PropertySourcesPlaceholderConfigurer is not configured as a
// static @Bean, then the following can be used to directly access the
// The following can also be used to directly access the
// environment instead of relying on placeholder replacement.
// @Value("#{ environment['enigma'] }")
private
String
enigma
;
...
...
@@ -60,10 +58,6 @@ public class PropertySourcesInitializerTests {
return
enigma
;
}
@Bean
public
static
PropertySourcesPlaceholderConfigurer
placeholderConfigurer
()
{
return
new
PropertySourcesPlaceholderConfigurer
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录