Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
872839c6
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,发现更多精彩内容 >>
提交
872839c6
编写于
8月 09, 2016
作者:
张
张乐
提交者:
GitHub
8月 09, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #371 from nobodyiam/config-property-names
add getPropertyNames interfact to Config
上级
15c5d41b
a87984d3
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
77 addition
and
38 deletion
+77
-38
apollo-adminservice/pom.xml
apollo-adminservice/pom.xml
+1
-1
apollo-assembly/pom.xml
apollo-assembly/pom.xml
+1
-1
apollo-biz/pom.xml
apollo-biz/pom.xml
+1
-1
apollo-buildtools/pom.xml
apollo-buildtools/pom.xml
+1
-1
apollo-client/pom.xml
apollo-client/pom.xml
+1
-1
apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java
...ient/src/main/java/com/ctrip/framework/apollo/Config.java
+29
-27
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java
...a/com/ctrip/framework/apollo/internals/DefaultConfig.java
+12
-0
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java
...va/com/ctrip/framework/apollo/internals/SimpleConfig.java
+11
-0
apollo-client/src/test/java/com/ctrip/framework/apollo/ConfigServiceTest.java
...st/java/com/ctrip/framework/apollo/ConfigServiceTest.java
+7
-0
apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java
.../framework/apollo/internals/DefaultConfigManagerTest.java
+7
-0
apollo-common/pom.xml
apollo-common/pom.xml
+1
-1
apollo-configservice/pom.xml
apollo-configservice/pom.xml
+1
-1
apollo-core/pom.xml
apollo-core/pom.xml
+1
-1
apollo-demo/pom.xml
apollo-demo/pom.xml
+1
-1
apollo-portal/pom.xml
apollo-portal/pom.xml
+1
-1
pom.xml
pom.xml
+1
-1
未找到文件。
apollo-adminservice/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-assembly/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-biz/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-biz
</artifactId>
<artifactId>
apollo-biz
</artifactId>
...
...
apollo-buildtools/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-client/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/Config.java
浏览文件 @
872839c6
package
com.ctrip.framework.apollo
;
package
com.ctrip.framework.apollo
;
import
java.util.Set
;
/**
/**
* @author Jason Song(song_s@ctrip.com)
* @author Jason Song(song_s@ctrip.com)
*/
*/
...
@@ -20,7 +22,6 @@ public interface Config {
...
@@ -20,7 +22,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as integer
* @return the property value as integer
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Integer
getIntProperty
(
String
key
,
Integer
defaultValue
);
public
Integer
getIntProperty
(
String
key
,
Integer
defaultValue
);
...
@@ -32,7 +33,6 @@ public interface Config {
...
@@ -32,7 +33,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as long
* @return the property value as long
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Long
getLongProperty
(
String
key
,
Long
defaultValue
);
public
Long
getLongProperty
(
String
key
,
Long
defaultValue
);
...
@@ -44,7 +44,6 @@ public interface Config {
...
@@ -44,7 +44,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as short
* @return the property value as short
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Short
getShortProperty
(
String
key
,
Short
defaultValue
);
public
Short
getShortProperty
(
String
key
,
Short
defaultValue
);
...
@@ -56,7 +55,6 @@ public interface Config {
...
@@ -56,7 +55,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as float
* @return the property value as float
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Float
getFloatProperty
(
String
key
,
Float
defaultValue
);
public
Float
getFloatProperty
(
String
key
,
Float
defaultValue
);
...
@@ -68,7 +66,6 @@ public interface Config {
...
@@ -68,7 +66,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as double
* @return the property value as double
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Double
getDoubleProperty
(
String
key
,
Double
defaultValue
);
public
Double
getDoubleProperty
(
String
key
,
Double
defaultValue
);
...
@@ -80,7 +77,6 @@ public interface Config {
...
@@ -80,7 +77,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return the property value as byte
* @return the property value as byte
*
* @throws NumberFormatException if the property value is invalid
* @throws NumberFormatException if the property value is invalid
*/
*/
public
Byte
getByteProperty
(
String
key
,
Byte
defaultValue
);
public
Byte
getByteProperty
(
String
key
,
Byte
defaultValue
);
...
@@ -102,7 +98,6 @@ public interface Config {
...
@@ -102,7 +98,6 @@ public interface Config {
* @param key the property name
* @param key the property name
* @param delimiter the delimiter regex
* @param delimiter the delimiter regex
* @param defaultValue the default value when key is not found
* @param defaultValue the default value when key is not found
* @return
*/
*/
public
String
[]
getArrayProperty
(
String
key
,
String
delimiter
,
String
[]
defaultValue
);
public
String
[]
getArrayProperty
(
String
key
,
String
delimiter
,
String
[]
defaultValue
);
...
@@ -112,4 +107,11 @@ public interface Config {
...
@@ -112,4 +107,11 @@ public interface Config {
* @param listener the config change listener
* @param listener the config change listener
*/
*/
public
void
addChangeListener
(
ConfigChangeListener
listener
);
public
void
addChangeListener
(
ConfigChangeListener
listener
);
/**
* Return a set of the property names
*
* @return the property names
*/
public
Set
<
String
>
getPropertyNames
();
}
}
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java
浏览文件 @
872839c6
...
@@ -14,10 +14,12 @@ import org.slf4j.LoggerFactory;
...
@@ -14,10 +14,12 @@ import org.slf4j.LoggerFactory;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.Properties
;
import
java.util.Properties
;
import
java.util.Set
;
import
java.util.concurrent.atomic.AtomicReference
;
import
java.util.concurrent.atomic.AtomicReference
;
...
@@ -90,6 +92,16 @@ public class DefaultConfig extends AbstractConfig implements RepositoryChangeLis
...
@@ -90,6 +92,16 @@ public class DefaultConfig extends AbstractConfig implements RepositoryChangeLis
return
value
==
null
?
defaultValue
:
value
;
return
value
==
null
?
defaultValue
:
value
;
}
}
@Override
public
Set
<
String
>
getPropertyNames
()
{
Properties
properties
=
m_configProperties
.
get
();
if
(
properties
==
null
)
{
return
Collections
.
emptySet
();
}
return
properties
.
stringPropertyNames
();
}
@Override
@Override
public
synchronized
void
onRepositoryChange
(
String
namespace
,
Properties
newProperties
)
{
public
synchronized
void
onRepositoryChange
(
String
namespace
,
Properties
newProperties
)
{
if
(
newProperties
.
equals
(
m_configProperties
.
get
()))
{
if
(
newProperties
.
equals
(
m_configProperties
.
get
()))
{
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java
浏览文件 @
872839c6
...
@@ -11,9 +11,11 @@ import com.dianping.cat.Cat;
...
@@ -11,9 +11,11 @@ import com.dianping.cat.Cat;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Properties
;
import
java.util.Properties
;
import
java.util.Set
;
/**
/**
* @author Jason Song(song_s@ctrip.com)
* @author Jason Song(song_s@ctrip.com)
...
@@ -59,6 +61,15 @@ public class SimpleConfig extends AbstractConfig implements RepositoryChangeList
...
@@ -59,6 +61,15 @@ public class SimpleConfig extends AbstractConfig implements RepositoryChangeList
return
this
.
m_configProperties
.
getProperty
(
key
,
defaultValue
);
return
this
.
m_configProperties
.
getProperty
(
key
,
defaultValue
);
}
}
@Override
public
Set
<
String
>
getPropertyNames
()
{
if
(
m_configProperties
==
null
)
{
return
Collections
.
emptySet
();
}
return
m_configProperties
.
stringPropertyNames
();
}
@Override
@Override
public
synchronized
void
onRepositoryChange
(
String
namespace
,
Properties
newProperties
)
{
public
synchronized
void
onRepositoryChange
(
String
namespace
,
Properties
newProperties
)
{
if
(
newProperties
.
equals
(
m_configProperties
))
{
if
(
newProperties
.
equals
(
m_configProperties
))
{
...
...
apollo-client/src/test/java/com/ctrip/framework/apollo/ConfigServiceTest.java
浏览文件 @
872839c6
...
@@ -10,6 +10,8 @@ import org.junit.Before;
...
@@ -10,6 +10,8 @@ import org.junit.Before;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.unidal.lookup.ComponentTestCase
;
import
org.unidal.lookup.ComponentTestCase
;
import
java.util.Set
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
/**
/**
...
@@ -92,6 +94,11 @@ public class ConfigServiceTest extends ComponentTestCase {
...
@@ -92,6 +94,11 @@ public class ConfigServiceTest extends ComponentTestCase {
return
m_namespace
+
":"
+
key
;
return
m_namespace
+
":"
+
key
;
}
}
@Override
public
Set
<
String
>
getPropertyNames
()
{
return
null
;
}
}
}
private
static
class
MockConfigFile
implements
ConfigFile
{
private
static
class
MockConfigFile
implements
ConfigFile
{
...
...
apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java
浏览文件 @
872839c6
...
@@ -11,6 +11,8 @@ import org.junit.Before;
...
@@ -11,6 +11,8 @@ import org.junit.Before;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.unidal.lookup.ComponentTestCase
;
import
org.unidal.lookup.ComponentTestCase
;
import
java.util.Set
;
import
static
org
.
hamcrest
.
core
.
IsEqual
.
equalTo
;
import
static
org
.
hamcrest
.
core
.
IsEqual
.
equalTo
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
junit
.
Assert
.
assertThat
;
...
@@ -94,6 +96,11 @@ public class DefaultConfigManagerTest extends ComponentTestCase {
...
@@ -94,6 +96,11 @@ public class DefaultConfigManagerTest extends ComponentTestCase {
public
String
getProperty
(
String
key
,
String
defaultValue
)
{
public
String
getProperty
(
String
key
,
String
defaultValue
)
{
return
namespace
+
":"
+
key
;
return
namespace
+
":"
+
key
;
}
}
@Override
public
Set
<
String
>
getPropertyNames
()
{
return
null
;
}
};
};
}
}
...
...
apollo-common/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-configservice/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-core/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
apollo-demo/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apollo-demo
</artifactId>
<artifactId>
apollo-demo
</artifactId>
...
...
apollo-portal/pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<parent>
<parent>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
pom.xml
浏览文件 @
872839c6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.ctrip.framework.apollo
</groupId>
<groupId>
com.ctrip.framework.apollo
</groupId>
<artifactId>
apollo
</artifactId>
<artifactId>
apollo
</artifactId>
<version>
0.0.
9
</version>
<version>
0.0.
10-SNAPSHOT
</version>
<name>
Apollo
</name>
<name>
Apollo
</name>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<description>
Ctrip Configuration Center
</description>
<description>
Ctrip Configuration Center
</description>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录