Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
dd2ce206
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
dd2ce206
编写于
10月 22, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SpringFactoriesLoader tolerates whitespace around class names
Issue: SPR-17413
上级
83a54dba
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
11 addition
and
12 deletion
+11
-12
spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
...pringframework/core/io/support/SpringFactoriesLoader.java
+4
-4
spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java
...framework/core/io/support/SpringFactoriesLoaderTests.java
+5
-6
spring-core/src/test/resources/META-INF/spring.factories
spring-core/src/test/resources/META-INF/spring.factories
+2
-2
未找到文件。
spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java
浏览文件 @
dd2ce206
...
@@ -19,7 +19,6 @@ package org.springframework.core.io.support;
...
@@ -19,7 +19,6 @@ package org.springframework.core.io.support;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.net.URL
;
import
java.net.URL
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.Enumeration
;
import
java.util.Enumeration
;
import
java.util.List
;
import
java.util.List
;
...
@@ -139,9 +138,10 @@ public final class SpringFactoriesLoader {
...
@@ -139,9 +138,10 @@ public final class SpringFactoriesLoader {
UrlResource
resource
=
new
UrlResource
(
url
);
UrlResource
resource
=
new
UrlResource
(
url
);
Properties
properties
=
PropertiesLoaderUtils
.
loadProperties
(
resource
);
Properties
properties
=
PropertiesLoaderUtils
.
loadProperties
(
resource
);
for
(
Map
.
Entry
<?,
?>
entry
:
properties
.
entrySet
())
{
for
(
Map
.
Entry
<?,
?>
entry
:
properties
.
entrySet
())
{
List
<
String
>
factoryClassNames
=
Arrays
.
asList
(
String
factoryClassName
=
((
String
)
entry
.
getKey
()).
trim
();
StringUtils
.
commaDelimitedListToStringArray
((
String
)
entry
.
getValue
()));
for
(
String
factoryName
:
StringUtils
.
commaDelimitedListToStringArray
((
String
)
entry
.
getValue
()))
{
result
.
addAll
((
String
)
entry
.
getKey
(),
factoryClassNames
);
result
.
add
(
factoryClassName
,
factoryName
.
trim
());
}
}
}
}
}
cache
.
put
(
classLoader
,
result
);
cache
.
put
(
classLoader
,
result
);
...
...
spring-core/src/test/java/org/springframework/core/io/support/SpringFactoriesLoaderTests.java
浏览文件 @
dd2ce206
/*
/*
* Copyright 2002-201
6
the original author or authors.
* Copyright 2002-201
8
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -33,8 +33,7 @@ public class SpringFactoriesLoaderTests {
...
@@ -33,8 +33,7 @@ public class SpringFactoriesLoaderTests {
@Test
@Test
public
void
loadFactoriesInCorrectOrder
()
{
public
void
loadFactoriesInCorrectOrder
()
{
List
<
DummyFactory
>
factories
=
SpringFactoriesLoader
List
<
DummyFactory
>
factories
=
SpringFactoriesLoader
.
loadFactories
(
DummyFactory
.
class
,
null
);
.
loadFactories
(
DummyFactory
.
class
,
null
);
assertEquals
(
2
,
factories
.
size
());
assertEquals
(
2
,
factories
.
size
());
assertTrue
(
factories
.
get
(
0
)
instanceof
MyDummyFactory1
);
assertTrue
(
factories
.
get
(
0
)
instanceof
MyDummyFactory1
);
assertTrue
(
factories
.
get
(
1
)
instanceof
MyDummyFactory2
);
assertTrue
(
factories
.
get
(
1
)
instanceof
MyDummyFactory2
);
...
@@ -46,9 +45,9 @@ public class SpringFactoriesLoaderTests {
...
@@ -46,9 +45,9 @@ public class SpringFactoriesLoaderTests {
}
}
@Test
@Test
public
void
loadPackagePrivateFactory
()
throws
Exception
{
public
void
loadPackagePrivateFactory
()
{
List
<
DummyPackagePrivateFactory
>
factories
=
SpringFactoriesLoader
List
<
DummyPackagePrivateFactory
>
factories
=
.
loadFactories
(
DummyPackagePrivateFactory
.
class
,
null
);
SpringFactoriesLoader
.
loadFactories
(
DummyPackagePrivateFactory
.
class
,
null
);
assertEquals
(
1
,
factories
.
size
());
assertEquals
(
1
,
factories
.
size
());
assertTrue
((
factories
.
get
(
0
).
getClass
().
getModifiers
()
&
Modifier
.
PUBLIC
)
==
0
);
assertTrue
((
factories
.
get
(
0
).
getClass
().
getModifiers
()
&
Modifier
.
PUBLIC
)
==
0
);
}
}
...
...
spring-core/src/test/resources/META-INF/spring.factories
浏览文件 @
dd2ce206
org.springframework.core.io.support.DummyFactory=\
org.springframework.core.io.support.DummyFactory
=\
org.springframework.core.io.support.MyDummyFactory2,\
org.springframework.core.io.support.MyDummyFactory2,
\
org.springframework.core.io.support.MyDummyFactory1
org.springframework.core.io.support.MyDummyFactory1
java.lang.String=\
java.lang.String=\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录