Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
fd0f2ca4
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,发现更多精彩内容 >>
提交
fd0f2ca4
编写于
5月 27, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add ip for client-server interactions so that we could have more info in the future to use
上级
64a1d15b
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
53 addition
and
37 deletion
+53
-37
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java
...trip/framework/apollo/internals/ConfigServiceLocator.java
+7
-4
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
...ip/framework/apollo/internals/RemoteConfigRepository.java
+11
-1
apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
...main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
+5
-0
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java
...ork/apollo/configservice/controller/ConfigController.java
+2
-10
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java
...ollo/configservice/controller/NotificationController.java
+3
-2
apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
...work/apollo/metaservice/controller/ServiceController.java
+1
-1
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/ConfigControllerTest.java
...apollo/configservice/controller/ConfigControllerTest.java
+14
-11
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerTest.java
.../configservice/controller/NotificationControllerTest.java
+8
-6
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/ConfigControllerIntegrationTest.java
...gservice/integration/ConfigControllerIntegrationTest.java
+2
-2
未找到文件。
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java
浏览文件 @
fd0f2ca4
package
com.ctrip.framework.apollo.internals
;
package
com.ctrip.framework.apollo.internals
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Joiner
;
import
com.google.common.base.Strings
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
com.google.common.escape.Escaper
;
import
com.google.common.escape.Escaper
;
...
@@ -23,7 +24,6 @@ import org.slf4j.Logger;
...
@@ -23,7 +24,6 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Inject
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.net.Networks
;
import
java.lang.reflect.Type
;
import
java.lang.reflect.Type
;
import
java.util.List
;
import
java.util.List
;
...
@@ -138,18 +138,21 @@ public class ConfigServiceLocator implements Initializable {
...
@@ -138,18 +138,21 @@ public class ConfigServiceLocator implements Initializable {
}
}
}
}
throw
new
RuntimeException
(
"Get config services failed"
,
exception
);
throw
new
RuntimeException
(
String
.
format
(
"Get config services failed from %s"
,
url
),
exception
);
}
}
private
String
assembleMetaServiceUrl
()
{
private
String
assembleMetaServiceUrl
()
{
String
domainName
=
m_configUtil
.
getMetaServerDomainName
();
String
domainName
=
m_configUtil
.
getMetaServerDomainName
();
String
appId
=
m_configUtil
.
getAppId
();
String
appId
=
m_configUtil
.
getAppId
();
String
localIp
=
Networks
.
forIp
().
getLocalHostAddress
();
String
localIp
=
m_configUtil
.
getLocalIp
();
Escaper
escaper
=
UrlEscapers
.
urlPathSegmentEscaper
();
Escaper
escaper
=
UrlEscapers
.
urlPathSegmentEscaper
();
Map
<
String
,
String
>
queryParams
=
Maps
.
newHashMap
();
Map
<
String
,
String
>
queryParams
=
Maps
.
newHashMap
();
queryParams
.
put
(
"appId"
,
escaper
.
escape
(
appId
));
queryParams
.
put
(
"appId"
,
escaper
.
escape
(
appId
));
queryParams
.
put
(
"ip"
,
escaper
.
escape
(
localIp
));
if
(!
Strings
.
isNullOrEmpty
(
localIp
))
{
queryParams
.
put
(
"ip"
,
escaper
.
escape
(
localIp
));
}
return
domainName
+
"/services/config?"
+
MAP_JOINER
.
join
(
queryParams
);
return
domainName
+
"/services/config?"
+
MAP_JOINER
.
join
(
queryParams
);
}
}
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java
浏览文件 @
fd0f2ca4
...
@@ -181,7 +181,8 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
...
@@ -181,7 +181,8 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
ApolloConfig
result
=
response
.
getBody
();
ApolloConfig
result
=
response
.
getBody
();
Cat
.
logEvent
(
"Apollo.Client.ConfigLoaded."
+
result
.
getNamespaceName
(),
result
.
getReleaseKey
());
Cat
.
logEvent
(
"Apollo.Client.ConfigLoaded."
+
result
.
getNamespaceName
(),
result
.
getReleaseKey
());
logger
.
debug
(
"Loaded config for {}: {}"
,
m_namespace
,
result
);
logger
.
debug
(
"Loaded config for {}: {}"
,
m_namespace
,
result
);
return
result
;
return
result
;
...
@@ -227,6 +228,11 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
...
@@ -227,6 +228,11 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
queryParams
.
put
(
"dataCenter"
,
escaper
.
escape
(
dataCenter
));
queryParams
.
put
(
"dataCenter"
,
escaper
.
escape
(
dataCenter
));
}
}
String
localIp
=
m_configUtil
.
getLocalIp
();
if
(!
Strings
.
isNullOrEmpty
(
localIp
))
{
queryParams
.
put
(
"ip"
,
escaper
.
escape
(
localIp
));
}
String
pathExpanded
=
String
.
format
(
path
,
pathParams
.
toArray
());
String
pathExpanded
=
String
.
format
(
path
,
pathParams
.
toArray
());
if
(!
queryParams
.
isEmpty
())
{
if
(!
queryParams
.
isEmpty
())
{
...
@@ -329,6 +335,10 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
...
@@ -329,6 +335,10 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
if
(!
Strings
.
isNullOrEmpty
(
dataCenter
))
{
if
(!
Strings
.
isNullOrEmpty
(
dataCenter
))
{
queryParams
.
put
(
"dataCenter"
,
escaper
.
escape
(
dataCenter
));
queryParams
.
put
(
"dataCenter"
,
escaper
.
escape
(
dataCenter
));
}
}
String
localIp
=
m_configUtil
.
getLocalIp
();
if
(!
Strings
.
isNullOrEmpty
(
localIp
))
{
queryParams
.
put
(
"ip"
,
escaper
.
escape
(
localIp
));
}
String
params
=
MAP_JOINER
.
join
(
queryParams
);
String
params
=
MAP_JOINER
.
join
(
queryParams
);
if
(!
uri
.
endsWith
(
"/"
))
{
if
(!
uri
.
endsWith
(
"/"
))
{
...
...
apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
浏览文件 @
fd0f2ca4
...
@@ -9,6 +9,7 @@ import com.ctrip.framework.apollo.core.enums.EnvUtils;
...
@@ -9,6 +9,7 @@ import com.ctrip.framework.apollo.core.enums.EnvUtils;
import
com.ctrip.framework.foundation.Foundation
;
import
com.ctrip.framework.foundation.Foundation
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.lookup.annotation.Named
;
import
org.unidal.net.Networks
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
...
@@ -79,6 +80,10 @@ public class ConfigUtil {
...
@@ -79,6 +80,10 @@ public class ConfigUtil {
return
env
;
return
env
;
}
}
public
String
getLocalIp
()
{
return
Networks
.
forIp
().
getLocalHostAddress
();
}
public
String
getMetaServerDomainName
()
{
public
String
getMetaServerDomainName
()
{
return
MetaDomainConsts
.
getDomain
(
getApolloEnv
());
return
MetaDomainConsts
.
getDomain
(
getApolloEnv
());
}
}
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java
浏览文件 @
fd0f2ca4
...
@@ -48,20 +48,12 @@ public class ConfigController {
...
@@ -48,20 +48,12 @@ public class ConfigController {
}.
getType
();
}.
getType
();
private
static
final
Joiner
STRING_JOINER
=
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
);
private
static
final
Joiner
STRING_JOINER
=
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
);
@RequestMapping
(
value
=
"/{appId}/{clusterName}"
,
method
=
RequestMethod
.
GET
)
public
ApolloConfig
queryConfig
(
@PathVariable
String
appId
,
@PathVariable
String
clusterName
,
@RequestParam
(
value
=
"dataCenter"
,
required
=
false
)
String
dataCenter
,
@RequestParam
(
value
=
"releaseKey"
,
defaultValue
=
"-1"
)
String
clientSideReleaseKey
,
HttpServletResponse
response
)
throws
IOException
{
return
this
.
queryConfig
(
appId
,
clusterName
,
ConfigConsts
.
NAMESPACE_DEFAULT
,
dataCenter
,
clientSideReleaseKey
,
response
);
}
@RequestMapping
(
value
=
"/{appId}/{clusterName}/{namespace}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/{appId}/{clusterName}/{namespace}"
,
method
=
RequestMethod
.
GET
)
public
ApolloConfig
queryConfig
(
@PathVariable
String
appId
,
@PathVariable
String
clusterName
,
public
ApolloConfig
queryConfig
(
@PathVariable
String
appId
,
@PathVariable
String
clusterName
,
@PathVariable
String
namespace
,
@PathVariable
String
namespace
,
@RequestParam
(
value
=
"dataCenter"
,
required
=
false
)
String
dataCenter
,
@RequestParam
(
value
=
"dataCenter"
,
required
=
false
)
String
dataCenter
,
@RequestParam
(
value
=
"releaseKey"
,
defaultValue
=
"-1"
)
String
clientSideReleaseKey
,
@RequestParam
(
value
=
"releaseKey"
,
defaultValue
=
"-1"
)
String
clientSideReleaseKey
,
@RequestParam
(
value
=
"ip"
,
required
=
false
)
String
clientIp
,
HttpServletResponse
response
)
throws
IOException
{
HttpServletResponse
response
)
throws
IOException
{
List
<
Release
>
releases
=
Lists
.
newLinkedList
();
List
<
Release
>
releases
=
Lists
.
newLinkedList
();
...
@@ -140,7 +132,7 @@ public class ConfigController {
...
@@ -140,7 +132,7 @@ public class ConfigController {
}
}
//try to load via data center
//try to load via data center
if
(!
Objects
.
isNull
(
dataCenter
)
&&
!
Objects
.
equals
(
dataCenter
,
clusterName
))
{
if
(!
Strings
.
isNullOrEmpty
(
dataCenter
)
&&
!
Objects
.
equals
(
dataCenter
,
clusterName
))
{
Release
dataCenterRelease
=
Release
dataCenterRelease
=
configService
.
findRelease
(
appId
,
dataCenter
,
namespace
);
configService
.
findRelease
(
appId
,
dataCenter
,
namespace
);
if
(!
Objects
.
isNull
(
dataCenterRelease
))
{
if
(!
Objects
.
isNull
(
dataCenterRelease
))
{
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/NotificationController.java
浏览文件 @
fd0f2ca4
...
@@ -60,7 +60,8 @@ public class NotificationController implements MessageListener {
...
@@ -60,7 +60,8 @@ public class NotificationController implements MessageListener {
@RequestParam
(
value
=
"appId"
)
String
appId
,
@RequestParam
(
value
=
"appId"
)
String
appId
,
@RequestParam
(
value
=
"cluster"
)
String
cluster
,
@RequestParam
(
value
=
"cluster"
)
String
cluster
,
@RequestParam
(
value
=
"namespace"
,
defaultValue
=
ConfigConsts
.
NAMESPACE_DEFAULT
)
String
namespace
,
@RequestParam
(
value
=
"namespace"
,
defaultValue
=
ConfigConsts
.
NAMESPACE_DEFAULT
)
String
namespace
,
@RequestParam
(
value
=
"dataCenter"
,
required
=
false
)
String
dataCenter
)
{
@RequestParam
(
value
=
"dataCenter"
,
required
=
false
)
String
dataCenter
,
@RequestParam
(
value
=
"ip"
,
required
=
false
)
String
clientIp
)
{
Set
<
String
>
watchedKeys
=
assembleWatchKeys
(
appId
,
cluster
,
namespace
,
dataCenter
);
Set
<
String
>
watchedKeys
=
assembleWatchKeys
(
appId
,
cluster
,
namespace
,
dataCenter
);
//Listen on more namespaces, since it's not the default namespace
//Listen on more namespaces, since it's not the default namespace
...
@@ -128,7 +129,7 @@ public class NotificationController implements MessageListener {
...
@@ -128,7 +129,7 @@ public class NotificationController implements MessageListener {
}
}
//watch data center config change
//watch data center config change
if
(!
Objects
.
isNull
(
dataCenter
)
&&
!
Objects
.
equals
(
dataCenter
,
clusterName
))
{
if
(!
Strings
.
isNullOrEmpty
(
dataCenter
)
&&
!
Objects
.
equals
(
dataCenter
,
clusterName
))
{
watchedKeys
.
add
(
assembleKey
(
appId
,
dataCenter
,
namespace
));
watchedKeys
.
add
(
assembleKey
(
appId
,
dataCenter
,
namespace
));
}
}
...
...
apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/controller/ServiceController.java
浏览文件 @
fd0f2ca4
...
@@ -42,7 +42,7 @@ public class ServiceController {
...
@@ -42,7 +42,7 @@ public class ServiceController {
@RequestMapping
(
"/config"
)
@RequestMapping
(
"/config"
)
public
List
<
ServiceDTO
>
getConfigService
(
public
List
<
ServiceDTO
>
getConfigService
(
@RequestParam
(
value
=
"appId"
,
defaultValue
=
""
)
String
appId
,
@RequestParam
(
value
=
"appId"
,
defaultValue
=
""
)
String
appId
,
@RequestParam
(
value
=
"ip"
,
defaultValue
=
""
)
String
clientIp
)
{
@RequestParam
(
value
=
"ip"
,
required
=
false
)
String
clientIp
)
{
List
<
InstanceInfo
>
instances
=
discoveryService
.
getConfigServiceInstances
();
List
<
InstanceInfo
>
instances
=
discoveryService
.
getConfigServiceInstances
();
List
<
ServiceDTO
>
result
=
instances
.
stream
().
map
(
new
Function
<
InstanceInfo
,
ServiceDTO
>()
{
List
<
ServiceDTO
>
result
=
instances
.
stream
().
map
(
new
Function
<
InstanceInfo
,
ServiceDTO
>()
{
...
...
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/ConfigControllerTest.java
浏览文件 @
fd0f2ca4
...
@@ -49,6 +49,7 @@ public class ConfigControllerTest {
...
@@ -49,6 +49,7 @@ public class ConfigControllerTest {
private
String
defaultNamespaceName
;
private
String
defaultNamespaceName
;
private
String
somePublicNamespaceName
;
private
String
somePublicNamespaceName
;
private
String
someDataCenter
;
private
String
someDataCenter
;
private
String
someClientIp
;
@Mock
@Mock
private
Release
someRelease
;
private
Release
someRelease
;
@Mock
@Mock
...
@@ -66,6 +67,7 @@ public class ConfigControllerTest {
...
@@ -66,6 +67,7 @@ public class ConfigControllerTest {
defaultNamespaceName
=
ConfigConsts
.
NAMESPACE_DEFAULT
;
defaultNamespaceName
=
ConfigConsts
.
NAMESPACE_DEFAULT
;
somePublicNamespaceName
=
"somePublicNamespace"
;
somePublicNamespaceName
=
"somePublicNamespace"
;
someDataCenter
=
"someDC"
;
someDataCenter
=
"someDC"
;
someClientIp
=
"someClientIp"
;
String
someValidConfiguration
=
"{\"apollo.bar\": \"foo\"}"
;
String
someValidConfiguration
=
"{\"apollo.bar\": \"foo\"}"
;
String
somePublicConfiguration
=
"{\"apollo.public.bar\": \"foo\"}"
;
String
somePublicConfiguration
=
"{\"apollo.public.bar\": \"foo\"}"
;
...
@@ -85,8 +87,8 @@ public class ConfigControllerTest {
...
@@ -85,8 +87,8 @@ public class ConfigControllerTest {
when
(
someRelease
.
getReleaseKey
()).
thenReturn
(
someServerSideNewReleaseKey
);
when
(
someRelease
.
getReleaseKey
()).
thenReturn
(
someServerSideNewReleaseKey
);
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
someClusterName
,
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
someClusterName
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
someClientIp
,
someResponse
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someClusterName
,
defaultNamespaceName
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someClusterName
,
defaultNamespaceName
);
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
...
@@ -106,7 +108,7 @@ public class ConfigControllerTest {
...
@@ -106,7 +108,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
someClusterName
,
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
someClusterName
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
some
ClientIp
,
some
Response
);
assertNull
(
result
);
assertNull
(
result
);
verify
(
someResponse
,
times
(
1
)).
sendError
(
eq
(
HttpServletResponse
.
SC_NOT_FOUND
),
anyString
());
verify
(
someResponse
,
times
(
1
)).
sendError
(
eq
(
HttpServletResponse
.
SC_NOT_FOUND
),
anyString
());
...
@@ -125,7 +127,7 @@ public class ConfigControllerTest {
...
@@ -125,7 +127,7 @@ public class ConfigControllerTest {
ApolloConfig
ApolloConfig
result
=
result
=
configController
.
queryConfig
(
someAppId
,
someClusterName
,
defaultNamespaceName
,
configController
.
queryConfig
(
someAppId
,
someClusterName
,
defaultNamespaceName
,
someDataCenter
,
String
.
valueOf
(
someClientSideReleaseKey
),
someResponse
);
someDataCenter
,
String
.
valueOf
(
someClientSideReleaseKey
),
some
ClientIp
,
some
Response
);
assertNull
(
result
);
assertNull
(
result
);
verify
(
someResponse
,
times
(
1
)).
setStatus
(
HttpServletResponse
.
SC_NOT_MODIFIED
);
verify
(
someResponse
,
times
(
1
)).
setStatus
(
HttpServletResponse
.
SC_NOT_MODIFIED
);
...
@@ -144,7 +146,7 @@ public class ConfigControllerTest {
...
@@ -144,7 +146,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
defaultClusterName
,
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
defaultClusterName
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
some
ClientIp
,
some
Response
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someDataCenter
,
defaultNamespaceName
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someDataCenter
,
defaultNamespaceName
);
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
...
@@ -168,10 +170,11 @@ public class ConfigControllerTest {
...
@@ -168,10 +170,11 @@ public class ConfigControllerTest {
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
defaultClusterName
,
ApolloConfig
result
=
configController
.
queryConfig
(
someAppId
,
defaultClusterName
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
defaultNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
some
ClientIp
,
some
Response
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someDataCenter
,
defaultNamespaceName
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
someDataCenter
,
defaultNamespaceName
);
verify
(
configService
,
times
(
1
)).
findRelease
(
someAppId
,
defaultClusterName
,
defaultNamespaceName
);
verify
(
configService
,
times
(
1
))
.
findRelease
(
someAppId
,
defaultClusterName
,
defaultNamespaceName
);
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
defaultClusterName
,
result
.
getCluster
());
assertEquals
(
defaultClusterName
,
result
.
getCluster
());
assertEquals
(
defaultNamespaceName
,
result
.
getNamespaceName
());
assertEquals
(
defaultNamespaceName
,
result
.
getNamespaceName
());
...
@@ -198,7 +201,7 @@ public class ConfigControllerTest {
...
@@ -198,7 +201,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
ApolloConfig
result
=
configController
configController
.
queryConfig
(
someAppId
,
someClusterName
,
someAppOwnNamespaceName
,
someDataCenter
,
.
queryConfig
(
someAppId
,
someClusterName
,
someAppOwnNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
someClientSideReleaseKey
,
some
ClientIp
,
some
Response
);
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
...
@@ -227,7 +230,7 @@ public class ConfigControllerTest {
...
@@ -227,7 +230,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
ApolloConfig
result
=
configController
configController
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
someClientSideReleaseKey
,
some
ClientIp
,
some
Response
);
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
...
@@ -259,7 +262,7 @@ public class ConfigControllerTest {
...
@@ -259,7 +262,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
ApolloConfig
result
=
configController
configController
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
someClientSideReleaseKey
,
someResponse
);
someClientSideReleaseKey
,
some
ClientIp
,
some
Response
);
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someServerSideReleaseKey
,
result
.
getReleaseKey
());
assertEquals
(
someAppId
,
result
.
getAppId
());
assertEquals
(
someAppId
,
result
.
getAppId
());
...
@@ -294,7 +297,7 @@ public class ConfigControllerTest {
...
@@ -294,7 +297,7 @@ public class ConfigControllerTest {
ApolloConfig
result
=
ApolloConfig
result
=
configController
configController
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
.
queryConfig
(
someAppId
,
someClusterName
,
somePublicNamespaceName
,
someDataCenter
,
someAppSideReleaseKey
,
someResponse
);
someAppSideReleaseKey
,
some
ClientIp
,
some
Response
);
assertEquals
(
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
assertEquals
(
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
.
join
(
someAppSideReleaseKey
,
somePublicAppSideReleaseKey
),
.
join
(
someAppSideReleaseKey
,
somePublicAppSideReleaseKey
),
...
...
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/controller/NotificationControllerTest.java
浏览文件 @
fd0f2ca4
...
@@ -39,6 +39,7 @@ public class NotificationControllerTest {
...
@@ -39,6 +39,7 @@ public class NotificationControllerTest {
private
String
defaultNamespace
;
private
String
defaultNamespace
;
private
String
somePublicNamespace
;
private
String
somePublicNamespace
;
private
String
someDataCenter
;
private
String
someDataCenter
;
private
String
someClientIp
;
@Mock
@Mock
private
AppNamespaceService
appNamespaceService
;
private
AppNamespaceService
appNamespaceService
;
@Mock
@Mock
...
@@ -58,6 +59,7 @@ public class NotificationControllerTest {
...
@@ -58,6 +59,7 @@ public class NotificationControllerTest {
defaultNamespace
=
ConfigConsts
.
NAMESPACE_DEFAULT
;
defaultNamespace
=
ConfigConsts
.
NAMESPACE_DEFAULT
;
somePublicNamespace
=
"somePublicNamespace"
;
somePublicNamespace
=
"somePublicNamespace"
;
someDataCenter
=
"someDC"
;
someDataCenter
=
"someDC"
;
someClientIp
=
"someClientIp"
;
deferredResults
=
deferredResults
=
(
Multimap
<
String
,
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>>)
ReflectionTestUtils
(
Multimap
<
String
,
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>>)
ReflectionTestUtils
...
@@ -68,7 +70,7 @@ public class NotificationControllerTest {
...
@@ -68,7 +70,7 @@ public class NotificationControllerTest {
public
void
testPollNotificationWithDefaultNamespace
()
throws
Exception
{
public
void
testPollNotificationWithDefaultNamespace
()
throws
Exception
{
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
someCluster
,
defaultNamespace
,
someDataCenter
);
.
pollNotification
(
someAppId
,
someCluster
,
defaultNamespace
,
someDataCenter
,
someClientIp
);
List
<
String
>
clusters
=
List
<
String
>
clusters
=
Lists
.
newArrayList
(
someCluster
,
someDataCenter
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
);
Lists
.
newArrayList
(
someCluster
,
someDataCenter
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
);
...
@@ -88,7 +90,7 @@ public class NotificationControllerTest {
...
@@ -88,7 +90,7 @@ public class NotificationControllerTest {
throws
Exception
{
throws
Exception
{
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
defaultCluster
,
defaultNamespace
,
someDataCenter
);
.
pollNotification
(
someAppId
,
defaultCluster
,
defaultNamespace
,
someDataCenter
,
someClientIp
);
List
<
String
>
clusters
=
List
<
String
>
clusters
=
Lists
.
newArrayList
(
someDataCenter
,
defaultCluster
);
Lists
.
newArrayList
(
someDataCenter
,
defaultCluster
);
...
@@ -108,7 +110,7 @@ public class NotificationControllerTest {
...
@@ -108,7 +110,7 @@ public class NotificationControllerTest {
throws
Exception
{
throws
Exception
{
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
defaultCluster
,
defaultNamespace
,
null
);
.
pollNotification
(
someAppId
,
defaultCluster
,
defaultNamespace
,
null
,
someClientIp
);
List
<
String
>
clusters
=
List
<
String
>
clusters
=
Lists
.
newArrayList
(
defaultCluster
);
Lists
.
newArrayList
(
defaultCluster
);
...
@@ -135,7 +137,7 @@ public class NotificationControllerTest {
...
@@ -135,7 +137,7 @@ public class NotificationControllerTest {
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
someCluster
,
somePublicNamespace
,
someDataCenter
);
.
pollNotification
(
someAppId
,
someCluster
,
somePublicNamespace
,
someDataCenter
,
someClientIp
);
List
<
String
>
clusters
=
List
<
String
>
clusters
=
Lists
.
newArrayList
(
someCluster
,
someDataCenter
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
);
Lists
.
newArrayList
(
someCluster
,
someDataCenter
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
);
...
@@ -161,7 +163,7 @@ public class NotificationControllerTest {
...
@@ -161,7 +163,7 @@ public class NotificationControllerTest {
public
void
testPollNotificationWithDefaultNamespaceAndHandleMessage
()
throws
Exception
{
public
void
testPollNotificationWithDefaultNamespaceAndHandleMessage
()
throws
Exception
{
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
someCluster
,
defaultNamespace
,
someDataCenter
);
.
pollNotification
(
someAppId
,
someCluster
,
defaultNamespace
,
someDataCenter
,
someClientIp
);
String
key
=
String
key
=
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
...
@@ -188,7 +190,7 @@ public class NotificationControllerTest {
...
@@ -188,7 +190,7 @@ public class NotificationControllerTest {
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
DeferredResult
<
ResponseEntity
<
ApolloConfigNotification
>>
deferredResult
=
controller
deferredResult
=
controller
.
pollNotification
(
someAppId
,
someCluster
,
somePublicNamespace
,
someDataCenter
);
.
pollNotification
(
someAppId
,
someCluster
,
somePublicNamespace
,
someDataCenter
,
someClientIp
);
String
key
=
String
key
=
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
Joiner
.
on
(
ConfigConsts
.
CLUSTER_NAMESPACE_SEPARATOR
)
...
...
apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/ConfigControllerIntegrationTest.java
浏览文件 @
fd0f2ca4
...
@@ -38,8 +38,8 @@ public class ConfigControllerIntegrationTest extends AbstractBaseIntegrationTest
...
@@ -38,8 +38,8 @@ public class ConfigControllerIntegrationTest extends AbstractBaseIntegrationTest
@Sql
(
scripts
=
"/integration-test/cleanup.sql"
,
executionPhase
=
Sql
.
ExecutionPhase
.
AFTER_TEST_METHOD
)
@Sql
(
scripts
=
"/integration-test/cleanup.sql"
,
executionPhase
=
Sql
.
ExecutionPhase
.
AFTER_TEST_METHOD
)
public
void
testQueryConfigWithDefaultClusterAndDefaultNamespaceOK
()
throws
Exception
{
public
void
testQueryConfigWithDefaultClusterAndDefaultNamespaceOK
()
throws
Exception
{
ResponseEntity
<
ApolloConfig
>
response
=
restTemplate
ResponseEntity
<
ApolloConfig
>
response
=
restTemplate
.
getForEntity
(
"{baseurl}/configs/{appId}/{clusterName}"
,
ApolloConfig
.
class
,
.
getForEntity
(
"{baseurl}/configs/{appId}/{clusterName}
/{namespace}
"
,
ApolloConfig
.
class
,
getHostUrl
(),
someAppId
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
);
getHostUrl
(),
someAppId
,
ConfigConsts
.
CLUSTER_NAME_DEFAULT
,
ConfigConsts
.
NAMESPACE_DEFAULT
);
ApolloConfig
result
=
response
.
getBody
();
ApolloConfig
result
=
response
.
getBody
();
assertEquals
(
HttpStatus
.
OK
,
response
.
getStatusCode
());
assertEquals
(
HttpStatus
.
OK
,
response
.
getStatusCode
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录