Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
19a8efc7
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,发现更多精彩内容 >>
提交
19a8efc7
编写于
7月 12, 2017
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revised assertions and $[invocationTime] support for exceptionMessage
Issue: SPR-15763
上级
5f767a86
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
20 deletion
+18
-20
spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
...amework/aop/interceptor/CustomizableTraceInterceptor.java
+18
-20
未找到文件。
spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java
浏览文件 @
19a8efc7
...
...
@@ -129,20 +129,20 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
/**
* The default message used for writing method entry messages.
*/
private
static
final
String
DEFAULT_ENTER_MESSAGE
=
"Entering method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
private
static
final
String
DEFAULT_ENTER_MESSAGE
=
"Entering method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
/**
* The default message used for writing method exit messages.
*/
private
static
final
String
DEFAULT_EXIT_MESSAGE
=
"Exiting method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
private
static
final
String
DEFAULT_EXIT_MESSAGE
=
"Exiting method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
/**
* The default message used for writing exception messages.
*/
private
static
final
String
DEFAULT_EXCEPTION_MESSAGE
=
"Exception thrown in method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
private
static
final
String
DEFAULT_EXCEPTION_MESSAGE
=
"Exception thrown in method '"
+
PLACEHOLDER_METHOD_NAME
+
"' of class ["
+
PLACEHOLDER_TARGET_CLASS_NAME
+
"]"
;
/**
* The {@code Pattern} used to match placeholders.
...
...
@@ -183,14 +183,14 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
* </ul>
*/
public
void
setEnterMessage
(
String
enterMessage
)
throws
IllegalArgumentException
{
Assert
.
hasText
(
enterMessage
,
"
'enterMessage'
must not be empty"
);
Assert
.
hasText
(
enterMessage
,
"
enterMessage
must not be empty"
);
checkForInvalidPlaceholders
(
enterMessage
);
Assert
.
doesNotContain
(
enterMessage
,
PLACEHOLDER_RETURN_VALUE
,
"enterMessage cannot contain placeholder
["
+
PLACEHOLDER_RETURN_VALUE
+
"]"
);
"enterMessage cannot contain placeholder
"
+
PLACEHOLDER_RETURN_VALUE
);
Assert
.
doesNotContain
(
enterMessage
,
PLACEHOLDER_EXCEPTION
,
"enterMessage cannot contain placeholder
["
+
PLACEHOLDER_EXCEPTION
+
"]"
);
"enterMessage cannot contain placeholder
"
+
PLACEHOLDER_EXCEPTION
);
Assert
.
doesNotContain
(
enterMessage
,
PLACEHOLDER_INVOCATION_TIME
,
"enterMessage cannot contain placeholder
["
+
PLACEHOLDER_INVOCATION_TIME
+
"]"
);
"enterMessage cannot contain placeholder
"
+
PLACEHOLDER_INVOCATION_TIME
);
this
.
enterMessage
=
enterMessage
;
}
...
...
@@ -207,10 +207,10 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
* </ul>
*/
public
void
setExitMessage
(
String
exitMessage
)
{
Assert
.
hasText
(
exitMessage
,
"
'exitMessage'
must not be empty"
);
Assert
.
hasText
(
exitMessage
,
"
exitMessage
must not be empty"
);
checkForInvalidPlaceholders
(
exitMessage
);
Assert
.
doesNotContain
(
exitMessage
,
PLACEHOLDER_EXCEPTION
,
"exitMessage cannot contain placeholder
["
+
PLACEHOLDER_EXCEPTION
+
"]"
);
"exitMessage cannot contain placeholder
"
+
PLACEHOLDER_EXCEPTION
);
this
.
exitMessage
=
exitMessage
;
}
...
...
@@ -226,12 +226,10 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
* </ul>
*/
public
void
setExceptionMessage
(
String
exceptionMessage
)
{
Assert
.
hasText
(
exceptionMessage
,
"
'exceptionMessage'
must not be empty"
);
Assert
.
hasText
(
exceptionMessage
,
"
exceptionMessage
must not be empty"
);
checkForInvalidPlaceholders
(
exceptionMessage
);
Assert
.
doesNotContain
(
exceptionMessage
,
PLACEHOLDER_RETURN_VALUE
,
"exceptionMessage cannot contain placeholder ["
+
PLACEHOLDER_RETURN_VALUE
+
"]"
);
Assert
.
doesNotContain
(
exceptionMessage
,
PLACEHOLDER_INVOCATION_TIME
,
"exceptionMessage cannot contain placeholder ["
+
PLACEHOLDER_INVOCATION_TIME
+
"]"
);
"exceptionMessage cannot contain placeholder "
+
PLACEHOLDER_RETURN_VALUE
);
this
.
exceptionMessage
=
exceptionMessage
;
}
...
...
@@ -263,8 +261,8 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
stopWatch
.
stop
();
}
exitThroughException
=
true
;
writeToLog
(
logger
,
replacePlaceholders
(
this
.
exceptionMessage
,
invocation
,
null
,
ex
,
stopWatch
.
getTotalTimeMillis
()),
ex
);
writeToLog
(
logger
,
replacePlaceholders
(
this
.
exceptionMessage
,
invocation
,
null
,
ex
,
stopWatch
.
getTotalTimeMillis
()),
ex
);
throw
ex
;
}
finally
{
...
...
@@ -272,8 +270,8 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
if
(
stopWatch
.
isRunning
())
{
stopWatch
.
stop
();
}
writeToLog
(
logger
,
replacePlaceholders
(
this
.
exitMessage
,
invocation
,
returnValue
,
null
,
stopWatch
.
getTotalTimeMillis
()));
writeToLog
(
logger
,
replacePlaceholders
(
this
.
exitMessage
,
invocation
,
returnValue
,
null
,
stopWatch
.
getTotalTimeMillis
()));
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录