Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
c61a80a8
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,发现更多精彩内容 >>
未验证
提交
c61a80a8
编写于
8月 12, 2018
作者:
J
Jason Song
提交者:
GitHub
8月 12, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1356 from nobodyiam/type-property
Add getProperty with transform function
上级
0118f1fa
2edacbac
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
68 addition
and
4 deletion
+68
-4
apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java
...ient/src/main/java/com/ctrip/framework/apollo/Config.java
+13
-0
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
.../com/ctrip/framework/apollo/internals/AbstractConfig.java
+21
-4
apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java
...m/ctrip/framework/apollo/internals/DefaultConfigTest.java
+34
-0
未找到文件。
apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java
浏览文件 @
c61a80a8
package
com.ctrip.framework.apollo
;
import
com.google.common.base.Function
;
import
java.util.Date
;
import
java.util.Locale
;
import
java.util.Set
;
...
...
@@ -182,4 +184,15 @@ public interface Config {
* @return the property names
*/
public
Set
<
String
>
getPropertyNames
();
/**
* Return the user-defined property value with the given key, or {@code defaultValue} if the key doesn't exist.
*
* @param key the property name
* @param function the transform {@link Function}. from String to user-defined type
* @param defaultValue the default value when key is not found or any error occurred
* @param <T> user-defined type
* @return the property value
*/
public
<
T
>
T
getProperty
(
String
key
,
Function
<
String
,
T
>
function
,
T
defaultValue
);
}
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
浏览文件 @
c61a80a8
...
...
@@ -64,10 +64,10 @@ public abstract class AbstractConfig implements Config {
}
public
AbstractConfig
()
{
m_configUtil
=
ApolloInjector
.
getInstance
(
ConfigUtil
.
class
);
m_configVersion
=
new
AtomicLong
();
m_arrayCache
=
Maps
.
newConcurrentMap
();
allCaches
=
Lists
.
newArrayList
();
m_configUtil
=
ApolloInjector
.
getInstance
(
ConfigUtil
.
class
);
m_configVersion
=
new
AtomicLong
();
m_arrayCache
=
Maps
.
newConcurrentMap
();
allCaches
=
Lists
.
newArrayList
();
}
@Override
...
...
@@ -349,6 +349,23 @@ public abstract class AbstractConfig implements Config {
return
defaultValue
;
}
@Override
public
<
T
>
T
getProperty
(
String
key
,
Function
<
String
,
T
>
function
,
T
defaultValue
)
{
try
{
String
value
=
getProperty
(
key
,
null
);
if
(
value
!=
null
)
{
return
function
.
apply
(
value
);
}
}
catch
(
Throwable
ex
)
{
Tracer
.
logError
(
new
ApolloConfigException
(
String
.
format
(
"getProperty for %s failed, return default value %s"
,
key
,
defaultValue
),
ex
));
}
return
defaultValue
;
}
private
<
T
>
T
getValueFromCache
(
String
key
,
Function
<
String
,
T
>
parser
,
Cache
<
String
,
T
>
cache
,
T
defaultValue
)
{
T
result
=
cache
.
getIfPresent
(
key
);
...
...
apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java
浏览文件 @
c61a80a8
...
...
@@ -17,8 +17,12 @@ import java.util.Map;
import
java.util.Properties
;
import
java.util.Set
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
import
com.google.common.base.Function
;
import
com.google.common.base.Splitter
;
import
com.google.common.collect.Lists
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
@@ -734,6 +738,36 @@ public class DefaultConfigTest {
assertEquals
(
Collections
.
emptySet
(),
propertyNames
);
}
@Test
public
void
testGetPropertyWithFunction
()
throws
Exception
{
String
someKey
=
"someKey"
;
String
someValue
=
"a,b,c"
;
String
someNullKey
=
"someNullKey"
;
//set up config repo
someProperties
=
new
Properties
();
someProperties
.
setProperty
(
someKey
,
someValue
);
when
(
configRepository
.
getConfig
()).
thenReturn
(
someProperties
);
DefaultConfig
defaultConfig
=
new
DefaultConfig
(
someNamespace
,
configRepository
);
assertEquals
(
defaultConfig
.
getProperty
(
someKey
,
new
Function
<
String
,
List
<
String
>>()
{
@Override
public
List
<
String
>
apply
(
String
s
)
{
return
Splitter
.
on
(
","
).
trimResults
().
omitEmptyStrings
().
splitToList
(
s
);
}
},
Lists
.<
String
>
newArrayList
()),
Lists
.
newArrayList
(
"a"
,
"b"
,
"c"
));
assertEquals
(
defaultConfig
.
getProperty
(
someNullKey
,
new
Function
<
String
,
List
<
String
>>()
{
@Override
public
List
<
String
>
apply
(
String
s
)
{
return
Splitter
.
on
(
","
).
trimResults
().
omitEmptyStrings
().
splitToList
(
s
);
}
},
Lists
.<
String
>
newArrayList
()),
Lists
.
newArrayList
());
}
private
void
checkDatePropertyWithFormat
(
Config
config
,
Date
expected
,
String
propertyName
,
String
format
,
Date
defaultValue
)
{
assertEquals
(
expected
,
config
.
getDateProperty
(
propertyName
,
format
,
defaultValue
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录