Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a3a5a03e
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 搜索 >>
提交
a3a5a03e
编写于
1月 26, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PropertySource annotation allows for custom encoding
Issue: SPR-13874
上级
2607a225
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
7 deletion
+25
-7
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
...ramework/context/annotation/ConfigurationClassParser.java
+16
-3
spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java
...rg/springframework/context/annotation/PropertySource.java
+9
-4
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
浏览文件 @
a3a5a03e
...
...
@@ -66,6 +66,7 @@ import org.springframework.core.env.MutablePropertySources;
import
org.springframework.core.env.PropertySource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.ResourceLoader
;
import
org.springframework.core.io.support.EncodedResource
;
import
org.springframework.core.io.support.ResourcePropertySource
;
import
org.springframework.core.type.AnnotationMetadata
;
import
org.springframework.core.type.MethodMetadata
;
...
...
@@ -354,6 +355,7 @@ class ConfigurationClassParser {
*/
private
void
processPropertySource
(
AnnotationAttributes
propertySource
)
throws
IOException
{
String
name
=
propertySource
.
getString
(
"name"
);
String
encoding
=
propertySource
.
getString
(
"encoding"
);
String
[]
locations
=
propertySource
.
getStringArray
(
"value"
);
boolean
ignoreResourceNotFound
=
propertySource
.
getBoolean
(
"ignoreResourceNotFound"
);
Assert
.
isTrue
(
locations
.
length
>
0
,
"At least one @PropertySource(value) location is required"
);
...
...
@@ -361,9 +363,7 @@ class ConfigurationClassParser {
try
{
String
resolvedLocation
=
this
.
environment
.
resolveRequiredPlaceholders
(
location
);
Resource
resource
=
this
.
resourceLoader
.
getResource
(
resolvedLocation
);
ResourcePropertySource
rps
=
(
StringUtils
.
hasText
(
name
)
?
new
ResourcePropertySource
(
name
,
resource
)
:
new
ResourcePropertySource
(
resource
));
addPropertySource
(
rps
);
addPropertySource
(
createPropertySource
(
name
,
encoding
,
resource
));
}
catch
(
IllegalArgumentException
ex
)
{
// from resolveRequiredPlaceholders
...
...
@@ -380,6 +380,19 @@ class ConfigurationClassParser {
}
}
private
ResourcePropertySource
createPropertySource
(
String
name
,
String
encoding
,
Resource
resource
)
throws
IOException
{
if
(
StringUtils
.
hasText
(
name
))
{
return
(
StringUtils
.
hasText
(
encoding
)
?
new
ResourcePropertySource
(
name
,
new
EncodedResource
(
resource
,
encoding
))
:
new
ResourcePropertySource
(
name
,
resource
));
}
else
{
return
(
StringUtils
.
hasText
(
encoding
)
?
new
ResourcePropertySource
(
new
EncodedResource
(
resource
,
encoding
))
:
new
ResourcePropertySource
(
resource
));
}
}
private
void
addPropertySource
(
ResourcePropertySource
propertySource
)
{
String
name
=
propertySource
.
getName
();
MutablePropertySources
propertySources
=
((
ConfigurableEnvironment
)
this
.
environment
).
getPropertySources
();
...
...
spring-context/src/main/java/org/springframework/context/annotation/PropertySource.java
浏览文件 @
a3a5a03e
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -148,14 +148,19 @@ import java.lang.annotation.Target;
public
@interface
PropertySource
{
/**
* Indicate the name of this property source. If omitted, a name
* will be generated based on the description of the underlying
* resource.
* Indicate the name of this property source. If omitted, a name will
* be generated based on the description of the underlying resource.
* @see org.springframework.core.env.PropertySource#getName()
* @see org.springframework.core.io.Resource#getDescription()
*/
String
name
()
default
""
;
/**
* A specific character encoding for the given resources, e.g. "UTF-8".
* @since 4.3
*/
String
encoding
()
default
""
;
/**
* Indicate the resource location(s) of the properties file to be loaded.
* For example, {@code "classpath:/com/myco/app.properties"} or
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录