Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a0cad5c4
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,体验更适合开发者的 AI 搜索 >>
提交
a0cad5c4
编写于
7月 08, 2016
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use streams and lambdas in spring-test where feasible
Issue: SPR-13188
上级
8fff1c2a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
24 deletion
+17
-24
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
...rk/test/context/jdbc/SqlScriptsTestExecutionListener.java
+3
-8
spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
...ntext/transaction/TransactionalTestExecutionListener.java
+5
-8
spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
...framework/test/context/util/TestContextResourceUtils.java
+9
-8
未找到文件。
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
浏览文件 @
a0cad5c4
...
...
@@ -40,10 +40,8 @@ import org.springframework.test.context.transaction.TestContextTransactionUtils;
import
org.springframework.test.context.util.TestContextResourceUtils
;
import
org.springframework.transaction.PlatformTransactionManager
;
import
org.springframework.transaction.TransactionDefinition
;
import
org.springframework.transaction.TransactionStatus
;
import
org.springframework.transaction.interceptor.DefaultTransactionAttribute
;
import
org.springframework.transaction.interceptor.TransactionAttribute
;
import
org.springframework.transaction.support.TransactionCallbackWithoutResult
;
import
org.springframework.transaction.support.TransactionTemplate
;
import
org.springframework.util.ClassUtils
;
import
org.springframework.util.ObjectUtils
;
...
...
@@ -244,12 +242,9 @@ public class SqlScriptsTestExecutionListener extends AbstractTestExecutionListen
TransactionAttribute
transactionAttribute
=
TestContextTransactionUtils
.
createDelegatingTransactionAttribute
(
testContext
,
new
DefaultTransactionAttribute
(
propagation
));
new
TransactionTemplate
(
transactionManager
,
transactionAttribute
).
execute
(
new
TransactionCallbackWithoutResult
()
{
@Override
public
void
doInTransactionWithoutResult
(
TransactionStatus
status
)
{
populator
.
execute
(
finalDataSource
);
}
new
TransactionTemplate
(
transactionManager
,
transactionAttribute
).
execute
(
status
->
{
populator
.
execute
(
finalDataSource
);
return
null
;
});
}
}
...
...
spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
浏览文件 @
a0cad5c4
...
...
@@ -19,9 +19,10 @@ package org.springframework.test.context.transaction;
import
java.lang.annotation.Annotation
;
import
java.lang.reflect.InvocationTargetException
;
import
java.lang.reflect.Method
;
import
java.util.Array
List
;
import
java.util.Array
s
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
...
...
@@ -442,13 +443,9 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
* as well as annotated interface default methods
*/
private
List
<
Method
>
getAnnotatedMethods
(
Class
<?>
clazz
,
Class
<?
extends
Annotation
>
annotationType
)
{
List
<
Method
>
methods
=
new
ArrayList
<>(
4
);
for
(
Method
method
:
ReflectionUtils
.
getUniqueDeclaredMethods
(
clazz
))
{
if
(
AnnotationUtils
.
getAnnotation
(
method
,
annotationType
)
!=
null
)
{
methods
.
add
(
method
);
}
}
return
methods
;
return
Arrays
.
stream
(
ReflectionUtils
.
getUniqueDeclaredMethods
(
clazz
))
.
filter
(
method
->
AnnotatedElementUtils
.
hasAnnotation
(
method
,
annotationType
))
.
collect
(
Collectors
.
toList
());
}
/**
...
...
spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
浏览文件 @
a0cad5c4
...
...
@@ -16,8 +16,10 @@
package
org.springframework.test.context.util
;
import
java.util.Array
List
;
import
java.util.Array
s
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.ResourceLoader
;
...
...
@@ -98,8 +100,7 @@ public abstract class TestContextResourceUtils {
* @see #convertToClasspathResourcePaths
*/
public
static
Resource
[]
convertToResources
(
ResourceLoader
resourceLoader
,
String
...
paths
)
{
List
<
Resource
>
list
=
convertToResourceList
(
resourceLoader
,
paths
);
return
list
.
toArray
(
new
Resource
[
list
.
size
()]);
return
stream
(
resourceLoader
,
paths
).
toArray
(
Resource
[]::
new
);
}
/**
...
...
@@ -114,11 +115,11 @@ public abstract class TestContextResourceUtils {
* @see #convertToClasspathResourcePaths
*/
public
static
List
<
Resource
>
convertToResourceList
(
ResourceLoader
resourceLoader
,
String
...
paths
)
{
List
<
Resource
>
list
=
new
ArrayList
<>(
);
for
(
String
path
:
paths
)
{
list
.
add
(
resourceLoader
.
getResource
(
path
));
}
return
list
;
return
stream
(
resourceLoader
,
paths
).
collect
(
Collectors
.
toList
()
);
}
private
static
Stream
<
Resource
>
stream
(
ResourceLoader
resourceLoader
,
String
...
paths
)
{
return
Arrays
.
stream
(
paths
).
map
(
resourceLoader:
:
getResource
)
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录