Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
4ff0f795
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4ff0f795
编写于
10月 27, 2017
作者:
杨
杨继龙
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor the ResourceUtils for performance
上级
2bebe108
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
39 deletion
+41
-39
apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java
.../com/ctrip/framework/apollo/core/utils/ResourceUtils.java
+41
-39
未找到文件。
apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java
浏览文件 @
4ff0f795
...
...
@@ -7,10 +7,8 @@ import java.io.File;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.io.FileNotFoundException
;
import
java.nio.file.Paths
;
import
java.util.Enumeration
;
import
java.util.Properties
;
public
class
ResourceUtils
{
...
...
@@ -20,29 +18,18 @@ public class ResourceUtils {
@SuppressWarnings
(
"unchecked"
)
public
static
Properties
readConfigFile
(
String
configPath
,
Properties
defaults
)
{
InputStream
in
=
loadConfigFileFromDefaultSearchLocations
(
configPath
);
logger
.
debug
(
"Reading config from resource {}"
,
configPath
);
Properties
props
=
new
Properties
();
try
{
if
(
in
==
null
)
{
// load outside resource under current user path
Path
path
=
new
File
(
System
.
getProperty
(
"user.dir"
)
+
configPath
).
toPath
();
if
(
Files
.
isReadable
(
path
))
{
in
=
new
FileInputStream
(
path
.
toFile
());
logger
.
debug
(
"Reading config from file {} "
,
path
);
}
else
{
logger
.
warn
(
"Could not find available config file"
);
}
}
if
(
defaults
!=
null
)
{
props
.
putAll
(
defaults
);
}
if
(
defaults
!=
null
)
{
props
.
putAll
(
defaults
);
}
InputStream
in
=
loadConfigFileFromDefaultSearchLocations
(
configPath
);
try
{
if
(
in
!=
null
)
{
props
.
load
(
in
);
in
.
close
();
}
}
catch
(
Exception
ex
)
{
}
catch
(
IO
Exception
ex
)
{
logger
.
warn
(
"Reading config failed: {}"
,
ex
.
getMessage
());
}
finally
{
if
(
in
!=
null
)
{
...
...
@@ -53,33 +40,48 @@ public class ResourceUtils {
}
}
}
StringBuilder
sb
=
new
StringBuilder
();
for
(
Enumeration
<
String
>
e
=
(
Enumeration
<
String
>)
props
.
propertyNames
();
e
.
hasMoreElements
();)
{
String
key
=
e
.
nextElement
();
String
val
=
(
String
)
props
.
getProperty
(
key
);
sb
.
append
(
key
).
append
(
'='
).
append
(
val
).
append
(
'\n'
);
}
if
(
sb
.
length
()
>
0
)
{
logger
.
debug
(
"Reading properties: \n"
+
sb
.
toString
());
}
else
{
logger
.
warn
(
"No available properties"
);
if
(
logger
.
isDebugEnabled
())
{
StringBuilder
sb
=
new
StringBuilder
();
for
(
String
sropertyName
:
props
.
stringPropertyNames
())
{
sb
.
append
(
sropertyName
).
append
(
'='
).
append
(
props
.
getProperty
(
sropertyName
)).
append
(
'\n'
);
}
if
(
sb
.
length
()
>
0
)
{
logger
.
debug
(
"Reading properties: \n"
+
sb
.
toString
());
}
else
{
logger
.
warn
(
"No available properties"
);
}
}
return
props
;
}
private
static
InputStream
loadConfigFileFromDefaultSearchLocations
(
String
configPath
)
{
for
(
String
searchLocation
:
DEFAULT_FILE_SEARCH_LOCATIONS
)
{
try
{
try
{
for
(
String
searchLocation
:
DEFAULT_FILE_SEARCH_LOCATIONS
)
{
File
candidate
=
Paths
.
get
(
searchLocation
,
configPath
).
toFile
();
if
(
candidate
.
exists
()
&&
candidate
.
isFile
()
&&
candidate
.
canRead
())
{
logger
.
debug
(
"Reading config from resource {}"
,
candidate
.
getAbsolutePath
());
return
new
FileInputStream
(
candidate
);
}
}
catch
(
Throwable
ex
)
{
//ignore
}
}
return
ClassLoaderUtil
.
getLoader
().
getResourceAsStream
(
configPath
);
InputStream
in
=
ClassLoaderUtil
.
getLoader
().
getResourceAsStream
(
configPath
);
if
(
in
!=
null
)
{
logger
.
debug
(
"Reading config from resource {}"
,
ClassLoaderUtil
.
getLoader
().
getResource
(
configPath
).
getPath
());
return
in
;
}
else
{
// load outside resource under current user path
File
candidate
=
new
File
(
System
.
getProperty
(
"user.dir"
)
+
configPath
);
if
(
candidate
.
exists
()
&&
candidate
.
isFile
()
&&
candidate
.
canRead
())
{
logger
.
debug
(
"Reading config from resource {}"
,
candidate
.
getAbsolutePath
());
return
new
FileInputStream
(
candidate
);
}
}
}
catch
(
FileNotFoundException
e
)
{
//ignore
}
return
null
;
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录