Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a6e4b64c
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,发现更多精彩内容 >>
提交
a6e4b64c
编写于
7月 02, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PropertySourcesPropertyResolver provides logKeyFound template method
Issue: SPR-14370
上级
f6334fc6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
10 deletion
+23
-10
spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
...ngframework/core/env/PropertySourcesPropertyResolver.java
+23
-10
未找到文件。
spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java
浏览文件 @
a6e4b64c
...
@@ -82,10 +82,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
...
@@ -82,10 +82,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
if
(
resolveNestedPlaceholders
&&
value
instanceof
String
)
{
if
(
resolveNestedPlaceholders
&&
value
instanceof
String
)
{
value
=
resolveNestedPlaceholders
((
String
)
value
);
value
=
resolveNestedPlaceholders
((
String
)
value
);
}
}
if
(
logger
.
isDebugEnabled
())
{
logKeyFound
(
key
,
propertySource
,
value
);
logger
.
debug
(
String
.
format
(
"Found key '%s' in [%s] with type [%s] and value '%s'"
,
key
,
propertySource
.
getName
(),
value
.
getClass
().
getSimpleName
(),
value
));
}
return
this
.
conversionService
.
convert
(
value
,
targetValueType
);
return
this
.
conversionService
.
convert
(
value
,
targetValueType
);
}
}
}
}
...
@@ -106,10 +103,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
...
@@ -106,10 +103,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
}
}
Object
value
=
propertySource
.
getProperty
(
key
);
Object
value
=
propertySource
.
getProperty
(
key
);
if
(
value
!=
null
)
{
if
(
value
!=
null
)
{
if
(
logger
.
isDebugEnabled
())
{
logKeyFound
(
key
,
propertySource
,
value
);
logger
.
debug
(
String
.
format
(
"Found key '%s' in [%s] with value '%s'"
,
key
,
propertySource
.
getName
(),
value
));
}
Class
<?>
clazz
;
Class
<?>
clazz
;
if
(
value
instanceof
String
)
{
if
(
value
instanceof
String
)
{
try
{
try
{
...
@@ -140,17 +134,36 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
...
@@ -140,17 +134,36 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
return
null
;
return
null
;
}
}
/**
* Log the given key as found in the given {@link PropertySource}, resulting in
* the given value.
* <p>The default implementation writes a debug log message, including the value.
* Subclasses may override this to change the log level and/or the log message.
* @param key the key found
* @param propertySource the {@code PropertySource} that the key has been found in
* @param value the corresponding value
* @since 4.3.1
*/
protected
void
logKeyFound
(
String
key
,
PropertySource
<?>
propertySource
,
Object
value
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
String
.
format
(
"Found key '%s' in [%s] with type [%s] and value '%s'"
,
key
,
propertySource
.
getName
(),
value
.
getClass
().
getSimpleName
(),
value
));
}
}
@SuppressWarnings
(
"serial"
)
@SuppressWarnings
(
"serial"
)
@Deprecated
@Deprecated
private
static
class
ClassConversionException
extends
ConversionException
{
private
static
class
ClassConversionException
extends
ConversionException
{
public
ClassConversionException
(
Class
<?>
actual
,
Class
<?>
expected
)
{
public
ClassConversionException
(
Class
<?>
actual
,
Class
<?>
expected
)
{
super
(
String
.
format
(
"Actual type %s is not assignable to expected type %s"
,
actual
.
getName
(),
expected
.
getName
()));
super
(
String
.
format
(
"Actual type %s is not assignable to expected type %s"
,
actual
.
getName
(),
expected
.
getName
()));
}
}
public
ClassConversionException
(
String
actual
,
Class
<?>
expected
,
Exception
ex
)
{
public
ClassConversionException
(
String
actual
,
Class
<?>
expected
,
Exception
ex
)
{
super
(
String
.
format
(
"Could not find/load class %s during attempt to convert to %s"
,
actual
,
expected
.
getName
()),
ex
);
super
(
String
.
format
(
"Could not find/load class %s during attempt to convert to %s"
,
actual
,
expected
.
getName
()),
ex
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录