Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
df1c73b7
apollo
项目概览
wrr-cat
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
df1c73b7
编写于
3月 29, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change appid data type to String
上级
29858d70
变更
44
隐藏空白更改
内联
并排
Showing
44 changed file
with
151 addition
and
148 deletion
+151
-148
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ClusterController.java
...rip/apollo/adminservice/controller/ClusterController.java
+1
-1
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/VersionController.java
...rip/apollo/adminservice/controller/VersionController.java
+1
-1
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java
...iz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java
+3
-3
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/ConfigItem.java
...src/main/java/com/ctrip/apollo/biz/entity/ConfigItem.java
+3
-3
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Release.java
...iz/src/main/java/com/ctrip/apollo/biz/entity/Release.java
+3
-3
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Version.java
...iz/src/main/java/com/ctrip/apollo/biz/entity/Version.java
+3
-3
apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ClusterRepository.java
...va/com/ctrip/apollo/biz/repository/ClusterRepository.java
+1
-1
apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/VersionRepository.java
...va/com/ctrip/apollo/biz/repository/VersionRepository.java
+2
-2
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminConfigService.java
...java/com/ctrip/apollo/biz/service/AdminConfigService.java
+2
-2
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ConfigService.java
...main/java/com/ctrip/apollo/biz/service/ConfigService.java
+2
-2
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/impl/AdminConfigServiceImpl.java
...ctrip/apollo/biz/service/impl/AdminConfigServiceImpl.java
+6
-4
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/impl/ConfigServiceImpl.java
.../com/ctrip/apollo/biz/service/impl/ConfigServiceImpl.java
+2
-2
apollo-biz/src/test/java/com/ctrip/apollo/biz/service/impl/ConfigServiceImplTest.java
.../ctrip/apollo/biz/service/impl/ConfigServiceImplTest.java
+4
-4
apollo-client/src/main/java/com/ctrip/apollo/client/env/ClientEnvironment.java
...n/java/com/ctrip/apollo/client/env/ClientEnvironment.java
+1
-1
apollo-client/src/main/java/com/ctrip/apollo/client/loader/ConfigLoaderManager.java
...a/com/ctrip/apollo/client/loader/ConfigLoaderManager.java
+1
-1
apollo-client/src/main/java/com/ctrip/apollo/client/loader/impl/RemoteConfigLoader.java
...m/ctrip/apollo/client/loader/impl/RemoteConfigLoader.java
+1
-1
apollo-client/src/main/java/com/ctrip/apollo/client/model/ApolloRegistry.java
...in/java/com/ctrip/apollo/client/model/ApolloRegistry.java
+3
-3
apollo-client/src/main/java/com/ctrip/apollo/client/util/ConfigUtil.java
...rc/main/java/com/ctrip/apollo/client/util/ConfigUtil.java
+1
-1
apollo-client/src/test/java/com/ctrip/apollo/client/loader/ConfigLoaderManagerTest.java
...m/ctrip/apollo/client/loader/ConfigLoaderManagerTest.java
+8
-8
apollo-client/src/test/java/com/ctrip/apollo/client/loader/impl/RemoteConfigLoaderTest.java
...rip/apollo/client/loader/impl/RemoteConfigLoaderTest.java
+5
-5
apollo-client/src/test/java/com/ctrip/apollo/client/util/ConfigUtilTest.java
...est/java/com/ctrip/apollo/client/util/ConfigUtilTest.java
+1
-1
apollo-configservice/src/main/java/com/ctrip/apollo/configservice/controller/ConfigController.java
...rip/apollo/configservice/controller/ConfigController.java
+2
-2
apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
...apollo/configservice/controller/ConfigControllerTest.java
+4
-4
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ApolloConfig.java
...src/main/java/com/ctrip/apollo/core/dto/ApolloConfig.java
+3
-3
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ClusterDTO.java
...e/src/main/java/com/ctrip/apollo/core/dto/ClusterDTO.java
+3
-3
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ConfigItemDTO.java
...rc/main/java/com/ctrip/apollo/core/dto/ConfigItemDTO.java
+3
-3
apollo-core/src/main/java/com/ctrip/apollo/core/dto/VersionDTO.java
...e/src/main/java/com/ctrip/apollo/core/dto/VersionDTO.java
+3
-3
apollo-portal/src/main/java/com/ctrip/apollo/portal/api/AdminServiceAPI.java
...ain/java/com/ctrip/apollo/portal/api/AdminServiceAPI.java
+6
-4
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java
...ava/com/ctrip/apollo/portal/controller/AppController.java
+1
-1
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/ConfigController.java
.../com/ctrip/apollo/portal/controller/ConfigController.java
+4
-2
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/VersionController.java
...com/ctrip/apollo/portal/controller/VersionController.java
+1
-1
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/App.java
...tal/src/main/java/com/ctrip/apollo/portal/entity/App.java
+3
-3
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/AppConfigVO.java
...main/java/com/ctrip/apollo/portal/entity/AppConfigVO.java
+7
-7
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/Privilege.java
...c/main/java/com/ctrip/apollo/portal/entity/Privilege.java
+3
-3
apollo-portal/src/main/java/com/ctrip/apollo/portal/repository/AppRepository.java
...ava/com/ctrip/apollo/portal/repository/AppRepository.java
+1
-1
apollo-portal/src/main/java/com/ctrip/apollo/portal/repository/PrivilegeRepository.java
...m/ctrip/apollo/portal/repository/PrivilegeRepository.java
+3
-3
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/AppService.java
...main/java/com/ctrip/apollo/portal/service/AppService.java
+1
-1
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ConfigService.java
...n/java/com/ctrip/apollo/portal/service/ConfigService.java
+22
-20
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PrivilegeService.java
...ava/com/ctrip/apollo/portal/service/PrivilegeService.java
+4
-4
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/VersionService.java
.../java/com/ctrip/apollo/portal/service/VersionService.java
+1
-1
apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java
...com/ctrip/apollo/portal/controller/AppControllerTest.java
+3
-3
apollo-portal/src/test/java/com/ctrip/apollo/portal/repository/AppRepositoryTest.java
...com/ctrip/apollo/portal/repository/AppRepositoryTest.java
+1
-1
apollo-portal/src/test/java/com/ctrip/apollo/portal/service/ConfigServiceTest.java
...va/com/ctrip/apollo/portal/service/ConfigServiceTest.java
+16
-21
apollo-portal/src/test/java/com/ctrip/apollo/portal/service/PrivilegeServiceTest.java
...com/ctrip/apollo/portal/service/PrivilegeServiceTest.java
+2
-2
未找到文件。
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/ClusterController.java
浏览文件 @
df1c73b7
...
...
@@ -18,7 +18,7 @@ public class ClusterController {
private
AdminConfigService
adminConfigService
;
@RequestMapping
(
"/app/{appId}"
)
public
List
<
ClusterDTO
>
findClustersByApp
(
@PathVariable
lo
ng
appId
)
{
public
List
<
ClusterDTO
>
findClustersByApp
(
@PathVariable
Stri
ng
appId
)
{
return
adminConfigService
.
findClustersByApp
(
appId
);
}
}
apollo-adminservice/src/main/java/com/ctrip/apollo/adminservice/controller/VersionController.java
浏览文件 @
df1c73b7
...
...
@@ -18,7 +18,7 @@ public class VersionController {
private
AdminConfigService
adminConfigService
;
@RequestMapping
(
"/app/{appId}"
)
public
List
<
VersionDTO
>
versions
(
@PathVariable
lo
ng
appId
)
{
public
List
<
VersionDTO
>
versions
(
@PathVariable
Stri
ng
appId
)
{
return
adminConfigService
.
findVersionsByApp
(
appId
);
}
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Cluster.java
浏览文件 @
df1c73b7
...
...
@@ -25,7 +25,7 @@ public class Cluster {
private
String
name
;
@Column
(
nullable
=
false
)
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
boolean
isDeleted
;
...
...
@@ -48,11 +48,11 @@ public class Cluster {
this
.
name
=
name
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/ConfigItem.java
浏览文件 @
df1c73b7
...
...
@@ -26,7 +26,7 @@ public class ConfigItem {
private
String
clusterName
;
@Column
(
nullable
=
false
)
private
lo
ng
appId
;
private
Stri
ng
appId
;
@Column
(
nullable
=
false
)
private
String
key
;
...
...
@@ -76,11 +76,11 @@ public class ConfigItem {
this
.
clusterName
=
clusterName
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Release.java
浏览文件 @
df1c73b7
...
...
@@ -19,7 +19,7 @@ public class Release {
private
long
id
;
private
String
name
;
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
String
comment
;
private
boolean
isDeleted
;
...
...
@@ -42,11 +42,11 @@ public class Release {
this
.
name
=
name
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/entity/Version.java
浏览文件 @
df1c73b7
...
...
@@ -23,7 +23,7 @@ public class Version {
private
String
name
;
@Column
(
nullable
=
false
)
private
lo
ng
appId
;
private
Stri
ng
appId
;
@Column
(
nullable
=
false
)
private
long
releaseId
;
...
...
@@ -50,11 +50,11 @@ public class Version {
this
.
name
=
name
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/ClusterRepository.java
浏览文件 @
df1c73b7
...
...
@@ -9,6 +9,6 @@ import java.util.List;
public
interface
ClusterRepository
extends
PagingAndSortingRepository
<
Cluster
,
Long
>
{
List
<
Cluster
>
findByAppId
(
lo
ng
appId
);
List
<
Cluster
>
findByAppId
(
Stri
ng
appId
);
}
apollo-biz/src/main/java/com/ctrip/apollo/biz/repository/VersionRepository.java
浏览文件 @
df1c73b7
...
...
@@ -10,9 +10,9 @@ import java.util.List;
* @author Jason Song(song_s@ctrip.com)
*/
public
interface
VersionRepository
extends
PagingAndSortingRepository
<
Version
,
Long
>
{
Version
findByAppIdAndName
(
lo
ng
appId
,
String
name
);
Version
findByAppIdAndName
(
Stri
ng
appId
,
String
name
);
Version
findById
(
long
id
);
List
<
Version
>
findByAppId
(
lo
ng
appId
);
List
<
Version
>
findByAppId
(
Stri
ng
appId
);
}
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/AdminConfigService.java
浏览文件 @
df1c73b7
...
...
@@ -14,11 +14,11 @@ public interface AdminConfigService {
List
<
ReleaseSnapshotDTO
>
findReleaseSnapshotByReleaseId
(
long
releaseId
);
List
<
VersionDTO
>
findVersionsByApp
(
lo
ng
appId
);
List
<
VersionDTO
>
findVersionsByApp
(
Stri
ng
appId
);
VersionDTO
loadVersionById
(
long
versionId
);
List
<
ClusterDTO
>
findClustersByApp
(
lo
ng
appId
);
List
<
ClusterDTO
>
findClustersByApp
(
Stri
ng
appId
);
List
<
ConfigItemDTO
>
findConfigItemsByClusters
(
List
<
Long
>
clusterIds
);
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/ConfigService.java
浏览文件 @
df1c73b7
...
...
@@ -12,12 +12,12 @@ public interface ConfigService {
/**
* Load configuration from database
*/
ApolloConfig
loadConfig
(
lo
ng
appId
,
String
clusterName
,
String
versionName
);
ApolloConfig
loadConfig
(
Stri
ng
appId
,
String
clusterName
,
String
versionName
);
/**
* Load Version by appId and versionName from database
*/
Version
loadVersionByAppIdAndVersionName
(
lo
ng
appId
,
String
versionName
);
Version
loadVersionByAppIdAndVersionName
(
Stri
ng
appId
,
String
versionName
);
/**
* Load Config by version and clusterName from database
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/impl/AdminConfigServiceImpl.java
浏览文件 @
df1c73b7
package
com.ctrip.apollo.biz.service.impl
;
import
com.google.common.base.Strings
;
import
com.ctrip.apollo.biz.entity.Cluster
;
import
com.ctrip.apollo.biz.entity.ConfigItem
;
import
com.ctrip.apollo.biz.entity.ReleaseSnapshot
;
...
...
@@ -50,8 +52,8 @@ public class AdminConfigServiceImpl implements AdminConfigService {
@Override
public
List
<
VersionDTO
>
findVersionsByApp
(
lo
ng
appId
)
{
if
(
appId
<=
0
)
{
public
List
<
VersionDTO
>
findVersionsByApp
(
Stri
ng
appId
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
)
{
return
Collections
.
EMPTY_LIST
;
}
...
...
@@ -77,8 +79,8 @@ public class AdminConfigServiceImpl implements AdminConfigService {
}
@Override
public
List
<
ClusterDTO
>
findClustersByApp
(
lo
ng
appId
)
{
if
(
appId
<=
0
)
{
public
List
<
ClusterDTO
>
findClustersByApp
(
Stri
ng
appId
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
)
{
return
Collections
.
EMPTY_LIST
;
}
List
<
Cluster
>
clusters
=
clusterRepository
.
findByAppId
(
appId
);
...
...
apollo-biz/src/main/java/com/ctrip/apollo/biz/service/impl/ConfigServiceImpl.java
浏览文件 @
df1c73b7
...
...
@@ -33,7 +33,7 @@ public class ConfigServiceImpl implements ConfigService {
};
@Override
public
ApolloConfig
loadConfig
(
lo
ng
appId
,
String
clusterName
,
String
versionName
)
{
public
ApolloConfig
loadConfig
(
Stri
ng
appId
,
String
clusterName
,
String
versionName
)
{
Version
version
=
loadVersionByAppIdAndVersionName
(
appId
,
versionName
);
if
(
version
==
null
)
{
return
null
;
...
...
@@ -43,7 +43,7 @@ public class ConfigServiceImpl implements ConfigService {
}
@Override
public
Version
loadVersionByAppIdAndVersionName
(
lo
ng
appId
,
String
versionName
)
{
public
Version
loadVersionByAppIdAndVersionName
(
Stri
ng
appId
,
String
versionName
)
{
return
versionRepository
.
findByAppIdAndName
(
appId
,
versionName
);
}
...
...
apollo-biz/src/test/java/com/ctrip/apollo/biz/service/impl/ConfigServiceImplTest.java
浏览文件 @
df1c73b7
...
...
@@ -53,7 +53,7 @@ public class ConfigServiceImplTest {
@Test
public
void
testLoadConfig
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersionName"
;
long
someReleaseId
=
1
;
...
...
@@ -82,7 +82,7 @@ public class ConfigServiceImplTest {
@Test
public
void
testLoadConfigWithVersionNotFound
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersionName"
;
...
...
@@ -96,7 +96,7 @@ public class ConfigServiceImplTest {
@Test
public
void
testLoadConfigWithConfigNotFound
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersionName"
;
long
someReleaseId
=
1
;
...
...
@@ -114,7 +114,7 @@ public class ConfigServiceImplTest {
.
findByReleaseIdAndClusterName
(
someReleaseId
,
someClusterName
);
}
private
Version
assembleVersion
(
lo
ng
appId
,
String
versionName
,
long
releaseId
)
{
private
Version
assembleVersion
(
Stri
ng
appId
,
String
versionName
,
long
releaseId
)
{
Version
version
=
new
Version
();
version
.
setAppId
(
appId
);
version
.
setName
(
versionName
);
...
...
apollo-client/src/main/java/com/ctrip/apollo/client/env/ClientEnvironment.java
浏览文件 @
df1c73b7
...
...
@@ -17,7 +17,7 @@ public class ClientEnvironment {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ClientEnvironment
.
class
);
private
static
final
String
DEFAULT_FILE
=
"
/
apollo.properties"
;
private
static
final
String
DEFAULT_FILE
=
"apollo.properties"
;
private
AtomicReference
<
Env
>
env
=
new
AtomicReference
<
Env
>();
...
...
apollo-client/src/main/java/com/ctrip/apollo/client/loader/ConfigLoaderManager.java
浏览文件 @
df1c73b7
...
...
@@ -188,7 +188,7 @@ public class ConfigLoaderManager {
}
private
String
assemblePropertySourceName
(
ApolloConfig
apolloConfig
)
{
return
String
.
format
(
"%
d
-%s-%s-%d"
,
apolloConfig
.
getAppId
(),
apolloConfig
.
getCluster
(),
return
String
.
format
(
"%
s
-%s-%s-%d"
,
apolloConfig
.
getAppId
(),
apolloConfig
.
getCluster
(),
apolloConfig
.
getVersion
(),
apolloConfig
.
getReleaseId
());
}
}
apollo-client/src/main/java/com/ctrip/apollo/client/loader/impl/RemoteConfigLoader.java
浏览文件 @
df1c73b7
...
...
@@ -40,7 +40,7 @@ public class RemoteConfigLoader extends AbstractConfigLoader {
ApolloConfig
getRemoteConfig
(
RestTemplate
restTemplate
,
String
uri
,
String
cluster
,
ApolloRegistry
apolloRegistry
,
ApolloConfig
previousConfig
)
{
lo
ng
appId
=
apolloRegistry
.
getAppId
();
Stri
ng
appId
=
apolloRegistry
.
getAppId
();
String
version
=
apolloRegistry
.
getVersion
();
logger
.
info
(
"Loading config from {}, appId={}, cluster={}, version={}"
,
uri
,
appId
,
cluster
,
...
...
apollo-client/src/main/java/com/ctrip/apollo/client/model/ApolloRegistry.java
浏览文件 @
df1c73b7
...
...
@@ -6,14 +6,14 @@ import com.google.common.base.MoreObjects;
* @author Jason Song(song_s@ctrip.com)
*/
public
class
ApolloRegistry
{
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
String
version
;
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-client/src/main/java/com/ctrip/apollo/client/util/ConfigUtil.java
浏览文件 @
df1c73b7
...
...
@@ -67,7 +67,7 @@ public class ConfigUtil {
return
null
;
}
ApolloRegistry
registry
=
new
ApolloRegistry
();
registry
.
setAppId
(
Long
.
parseLong
(
properties
.
getProperty
(
Constants
.
APP_ID
)
));
registry
.
setAppId
(
properties
.
getProperty
(
Constants
.
APP_ID
));
registry
.
setVersion
(
properties
.
getProperty
(
Constants
.
VERSION
,
Constants
.
DEFAULT_VERSION_NAME
));
return
registry
;
...
...
apollo-client/src/test/java/com/ctrip/apollo/client/loader/ConfigLoaderManagerTest.java
浏览文件 @
df1c73b7
...
...
@@ -51,8 +51,8 @@ public class ConfigLoaderManagerTest {
@Test
public
void
testLoadPropertySource
()
throws
Exception
{
long
someAppId
=
100
;
long
anotherAppId
=
101
;
String
someAppId
=
"100"
;
String
anotherAppId
=
"101"
;
ApolloRegistry
someApolloRegistry
=
assembleSomeApolloRegistry
(
someAppId
,
"someVersion"
);
ApolloRegistry
anotherApolloRegistry
=
...
...
@@ -92,7 +92,7 @@ public class ConfigLoaderManagerTest {
@Test
(
expected
=
RuntimeException
.
class
)
public
void
testLoadPropertySourceWithError
()
throws
Exception
{
Exception
someException
=
mock
(
Exception
.
class
);
long
someAppId
=
100
;
String
someAppId
=
"100"
;
ApolloRegistry
someApolloRegistry
=
assembleSomeApolloRegistry
(
someAppId
,
"someVersion"
);
when
(
configUtil
.
loadApolloRegistries
()).
thenReturn
(
Lists
.
newArrayList
(
someApolloRegistry
));
...
...
@@ -114,7 +114,7 @@ public class ConfigLoaderManagerTest {
public
void
testLoadSingleApolloConfig
()
throws
Exception
{
ApolloConfig
someApolloConfig
=
mock
(
ApolloConfig
.
class
);
Map
<
String
,
Object
>
someMap
=
Maps
.
newHashMap
();
long
someAppId
=
100
;
String
someAppId
=
"100"
;
ApolloRegistry
someApolloRegistry
=
assembleSomeApolloRegistry
(
someAppId
,
"someVersion"
);
ApolloConfig
previousConfig
=
null
;
...
...
@@ -130,7 +130,7 @@ public class ConfigLoaderManagerTest {
@Test
public
void
testReloadPropertySource
()
throws
Exception
{
long
someAppId
=
100
;
String
someAppId
=
"100"
;
ApolloRegistry
someApolloRegistry
=
assembleSomeApolloRegistry
(
someAppId
,
"someVersion"
);
ApolloConfig
someApolloConfig
=
mock
(
ApolloConfig
.
class
);
Map
<
String
,
Object
>
someMap
=
mock
(
Map
.
class
);
...
...
@@ -162,7 +162,7 @@ public class ConfigLoaderManagerTest {
@Test
public
void
testCalcPropertyChanges
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
Map
<
String
,
Object
>
someConfig
=
Maps
.
newHashMap
();
someConfig
.
put
(
"key1"
,
"val1"
);
someConfig
.
put
(
"key2"
,
"val2"
);
...
...
@@ -195,7 +195,7 @@ public class ConfigLoaderManagerTest {
)));
}
ApolloConfig
assembleApolloConfig
(
lo
ng
appId
,
Map
<
String
,
Object
>
configurations
)
{
ApolloConfig
assembleApolloConfig
(
Stri
ng
appId
,
Map
<
String
,
Object
>
configurations
)
{
String
someCluster
=
"someCluster"
;
String
someVersion
=
"someVersion"
;
long
someReleaseId
=
1
;
...
...
@@ -207,7 +207,7 @@ public class ConfigLoaderManagerTest {
return
config
;
}
private
ApolloRegistry
assembleSomeApolloRegistry
(
lo
ng
someAppId
,
String
someVersion
)
{
private
ApolloRegistry
assembleSomeApolloRegistry
(
Stri
ng
someAppId
,
String
someVersion
)
{
ApolloRegistry
someApolloRegistry
=
new
ApolloRegistry
();
someApolloRegistry
.
setAppId
(
someAppId
);
someApolloRegistry
.
setVersion
(
someVersion
);
...
...
apollo-client/src/test/java/com/ctrip/apollo/client/loader/impl/RemoteConfigLoaderTest.java
浏览文件 @
df1c73b7
...
...
@@ -56,7 +56,7 @@ public class RemoteConfigLoaderTest {
String
someServerUrl
=
"http://someUrl"
;
String
someCluster
=
"some cluster"
;
ApolloConfig
apolloConfig
=
mock
(
ApolloConfig
.
class
);
long
someAppId
=
1
;
String
someAppId
=
"1"
;
ApolloRegistry
apolloRegistry
=
assembleSomeApolloRegistry
(
someAppId
,
"someVersion"
);
ApolloConfig
previousConfig
=
null
;
...
...
@@ -76,7 +76,7 @@ public class RemoteConfigLoaderTest {
@Test
public
void
testGetRemoteConfig
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someServerUrl
=
"http://someServer"
;
String
someClusterName
=
"someCluster"
;
String
someVersionName
=
"someVersion"
;
...
...
@@ -100,7 +100,7 @@ public class RemoteConfigLoaderTest {
@Test
(
expected
=
RuntimeException
.
class
)
public
void
testGetRemoteConfigWithServerError
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someServerUrl
=
"http://someServer"
;
String
someClusterName
=
"someCluster"
;
String
someVersionName
=
"someVersion"
;
...
...
@@ -118,7 +118,7 @@ public class RemoteConfigLoaderTest {
@Test
public
void
testGetRemoteConfigWith304Response
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someServerUrl
=
"http://someServer"
;
String
someClusterName
=
"someCluster"
;
String
someVersionName
=
"someVersion"
;
...
...
@@ -138,7 +138,7 @@ public class RemoteConfigLoaderTest {
assertNull
(
result
);
}
private
ApolloRegistry
assembleSomeApolloRegistry
(
lo
ng
someAppId
,
String
someVersion
)
{
private
ApolloRegistry
assembleSomeApolloRegistry
(
Stri
ng
someAppId
,
String
someVersion
)
{
ApolloRegistry
someApolloRegistry
=
new
ApolloRegistry
();
someApolloRegistry
.
setAppId
(
someAppId
);
someApolloRegistry
.
setVersion
(
someVersion
);
...
...
apollo-client/src/test/java/com/ctrip/apollo/client/util/ConfigUtilTest.java
浏览文件 @
df1c73b7
...
...
@@ -60,7 +60,7 @@ public class ConfigUtilTest {
ApolloRegistry
apolloRegistry
=
apolloRegistries
.
get
(
0
);
assertEquals
(
1
,
apolloRegistries
.
size
());
assertEquals
(
Long
.
parseLong
(
someAppId
)
,
apolloRegistry
.
getAppId
());
assertEquals
(
someAppId
,
apolloRegistry
.
getAppId
());
assertEquals
(
someVersionId
,
apolloRegistry
.
getVersion
());
}
...
...
apollo-configservice/src/main/java/com/ctrip/apollo/configservice/controller/ConfigController.java
浏览文件 @
df1c73b7
...
...
@@ -25,7 +25,7 @@ public class ConfigController {
private
ConfigService
configService
;
@RequestMapping
(
value
=
"/{appId}/{clusterName}/{versionName:.*}"
,
method
=
RequestMethod
.
GET
)
public
ApolloConfig
queryConfig
(
@PathVariable
lo
ng
appId
,
public
ApolloConfig
queryConfig
(
@PathVariable
Stri
ng
appId
,
@PathVariable
String
clusterName
,
@PathVariable
String
versionName
,
@RequestParam
(
value
=
"releaseId"
,
defaultValue
=
"-1"
)
long
clientSideReleaseId
,
...
...
@@ -33,7 +33,7 @@ public class ConfigController {
Version
version
=
configService
.
loadVersionByAppIdAndVersionName
(
appId
,
versionName
);
if
(
version
==
null
)
{
response
.
sendError
(
HttpServletResponse
.
SC_NOT_FOUND
,
String
.
format
(
"Could not load version with appId: %
d
, versionName: %s"
,
appId
,
String
.
format
(
"Could not load version with appId: %
s
, versionName: %s"
,
appId
,
versionName
));
return
null
;
}
...
...
apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
浏览文件 @
df1c73b7
...
...
@@ -42,7 +42,7 @@ public class ConfigControllerTest {
@Test
public
void
testQueryConfig
()
throws
Exception
{
ApolloConfig
someApolloConfig
=
mock
(
ApolloConfig
.
class
);
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersion"
;
long
someClientSideReleaseId
=
1
;
...
...
@@ -69,7 +69,7 @@ public class ConfigControllerTest {
@Test
public
void
testQueryConfigWithVersionNotFound
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersion"
;
long
someClientSideReleaseId
=
1
;
...
...
@@ -90,7 +90,7 @@ public class ConfigControllerTest {
@Test
public
void
testQueryConfigWithApolloConfigNotFound
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersion"
;
long
someClientSideReleaseId
=
1
;
...
...
@@ -116,7 +116,7 @@ public class ConfigControllerTest {
@Test
public
void
testQueryConfigWithApolloConfigNotModified
()
throws
Exception
{
long
someAppId
=
1
;
String
someAppId
=
"1"
;
String
someClusterName
=
"someClusterName"
;
String
someVersionName
=
"someVersion"
;
long
someClientSideReleaseId
=
1
;
...
...
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ApolloConfig.java
浏览文件 @
df1c73b7
...
...
@@ -12,7 +12,7 @@ import java.util.Map;
*/
public
class
ApolloConfig
implements
Comparable
<
ApolloConfig
>
{
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
String
cluster
;
...
...
@@ -25,7 +25,7 @@ public class ApolloConfig implements Comparable<ApolloConfig> {
private
int
order
;
@JsonCreator
public
ApolloConfig
(
@JsonProperty
(
"appId"
)
lo
ng
appId
,
public
ApolloConfig
(
@JsonProperty
(
"appId"
)
Stri
ng
appId
,
@JsonProperty
(
"cluster"
)
String
cluster
,
@JsonProperty
(
"version"
)
String
version
,
@JsonProperty
(
"releaseId"
)
long
releaseId
)
{
...
...
@@ -44,7 +44,7 @@ public class ApolloConfig implements Comparable<ApolloConfig> {
this
.
configurations
=
configurations
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
...
...
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ClusterDTO.java
浏览文件 @
df1c73b7
...
...
@@ -6,7 +6,7 @@ public class ClusterDTO {
private
String
name
;
private
lo
ng
appId
;
private
Stri
ng
appId
;
public
long
getId
()
{
return
id
;
...
...
@@ -24,11 +24,11 @@ public class ClusterDTO {
this
.
name
=
name
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
}
apollo-core/src/main/java/com/ctrip/apollo/core/dto/ConfigItemDTO.java
浏览文件 @
df1c73b7
...
...
@@ -10,7 +10,7 @@ public class ConfigItemDTO {
private
String
clusterName
;
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
String
key
;
...
...
@@ -59,11 +59,11 @@ public class ConfigItemDTO {
this
.
clusterName
=
clusterName
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-core/src/main/java/com/ctrip/apollo/core/dto/VersionDTO.java
浏览文件 @
df1c73b7
...
...
@@ -6,7 +6,7 @@ public class VersionDTO {
private
String
name
;
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
long
releaseId
;
...
...
@@ -32,11 +32,11 @@ public class VersionDTO {
this
.
name
=
name
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/api/AdminServiceAPI.java
浏览文件 @
df1c73b7
package
com.ctrip.apollo.portal.api
;
import
com.google.common.base.Strings
;
import
com.ctrip.apollo.Apollo
;
import
com.ctrip.apollo.core.dto.ClusterDTO
;
import
com.ctrip.apollo.core.dto.ConfigItemDTO
;
...
...
@@ -45,8 +47,8 @@ public class AdminServiceAPI {
public
static
String
CLUSTER_APP_API
=
"/cluster/app/"
;
public
ClusterDTO
[]
getClustersByApp
(
Apollo
.
Env
env
,
lo
ng
appId
)
{
if
(
appId
<=
0
)
{
public
ClusterDTO
[]
getClustersByApp
(
Apollo
.
Env
env
,
Stri
ng
appId
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
)
{
return
null
;
}
...
...
@@ -68,8 +70,8 @@ public class AdminServiceAPI {
return
restTemplate
.
getForObject
(
getAdminServiceHost
(
env
)
+
VERSION_API
+
versionId
,
VersionDTO
.
class
);
}
public
VersionDTO
[]
getVersionsByApp
(
Apollo
.
Env
env
,
lo
ng
appId
){
if
(
appId
<=
0
){
public
VersionDTO
[]
getVersionsByApp
(
Apollo
.
Env
env
,
Stri
ng
appId
){
if
(
Strings
.
isNullOrEmpty
(
appId
)
){
return
null
;
}
return
restTemplate
.
getForObject
(
getAdminServiceHost
(
env
)
+
VERSION_APP_API
+
appId
,
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/AppController.java
浏览文件 @
df1c73b7
...
...
@@ -28,7 +28,7 @@ public class AppController {
}
@RequestMapping
(
"/{appid}"
)
public
App
detail
(
@PathVariable
lo
ng
appid
)
{
public
App
detail
(
@PathVariable
Stri
ng
appid
)
{
App
app
=
appService
.
detail
(
appid
);
if
(
app
==
null
)
{
throw
new
NotFoundException
();
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/ConfigController.java
浏览文件 @
df1c73b7
package
com.ctrip.apollo.portal.controller
;
import
com.google.common.base.Strings
;
import
com.ctrip.apollo.Apollo
;
import
com.ctrip.apollo.portal.constants.PortalConstants
;
import
com.ctrip.apollo.portal.entity.AppConfigVO
;
...
...
@@ -19,10 +21,10 @@ public class ConfigController {
private
ConfigService
configService
;
@RequestMapping
(
"/{appId}/{env}/{versionId}"
)
public
AppConfigVO
detail
(
@PathVariable
lo
ng
appId
,
@PathVariable
String
env
,
public
AppConfigVO
detail
(
@PathVariable
Stri
ng
appId
,
@PathVariable
String
env
,
@PathVariable
long
versionId
)
{
if
(
appId
<=
0
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
)
{
throw
new
NotFoundException
();
}
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/controller/VersionController.java
浏览文件 @
df1c73b7
...
...
@@ -19,7 +19,7 @@ public class VersionController {
private
VersionService
versionService
;
@RequestMapping
(
"/{appId}/{env}"
)
public
List
<
VersionDTO
>
versions
(
@PathVariable
lo
ng
appId
,
@PathVariable
String
env
)
{
public
List
<
VersionDTO
>
versions
(
@PathVariable
Stri
ng
appId
,
@PathVariable
String
env
)
{
return
versionService
.
findVersionsByApp
(
Apollo
.
Env
.
DEV
,
appId
);
}
}
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/App.java
浏览文件 @
df1c73b7
...
...
@@ -16,7 +16,7 @@ public class App implements Serializable {
private
static
final
long
serialVersionUID
=
7348554309210401557L
;
@Id
private
lo
ng
appId
;
private
Stri
ng
appId
;
@Column
(
nullable
=
false
)
private
String
name
;
...
...
@@ -37,11 +37,11 @@ public class App implements Serializable {
private
Date
lastUpdatedTimestamp
;
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/AppConfigVO.java
浏览文件 @
df1c73b7
...
...
@@ -9,7 +9,7 @@ import java.util.List;
public
class
AppConfigVO
{
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
Env
env
;
...
...
@@ -46,7 +46,7 @@ public class AppConfigVO {
}
public
static
AppConfigVO
newInstance
(
lo
ng
appId
,
long
versionId
)
{
public
static
AppConfigVO
newInstance
(
Stri
ng
appId
,
long
versionId
)
{
AppConfigVO
instance
=
new
AppConfigVO
();
instance
.
setAppId
(
appId
);
instance
.
setVersionId
(
versionId
);
...
...
@@ -62,18 +62,18 @@ public class AppConfigVO {
public
static
class
OverrideAppConfig
{
private
lo
ng
appId
;
private
Stri
ng
appId
;
private
List
<
ConfigItemDTO
>
configs
;
public
OverrideAppConfig
()
{
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
@@ -120,11 +120,11 @@ public class AppConfigVO {
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/entity/Privilege.java
浏览文件 @
df1c73b7
...
...
@@ -26,7 +26,7 @@ public class Privilege implements Serializable {
private
String
privilType
;
@Column
private
lo
ng
appId
;
private
Stri
ng
appId
;
public
long
getId
()
{
return
id
;
...
...
@@ -52,11 +52,11 @@ public class Privilege implements Serializable {
this
.
privilType
=
privilType
;
}
public
lo
ng
getAppId
()
{
public
Stri
ng
getAppId
()
{
return
appId
;
}
public
void
setAppId
(
lo
ng
appId
)
{
public
void
setAppId
(
Stri
ng
appId
)
{
this
.
appId
=
appId
;
}
}
apollo-portal/src/main/java/com/ctrip/apollo/portal/repository/AppRepository.java
浏览文件 @
df1c73b7
...
...
@@ -10,5 +10,5 @@ public interface AppRepository extends PagingAndSortingRepository<App, String> {
Page
<
App
>
findAll
(
Pageable
pageable
);
App
findByAppId
(
lo
ng
appId
);
App
findByAppId
(
Stri
ng
appId
);
}
apollo-portal/src/main/java/com/ctrip/apollo/portal/repository/PrivilegeRepository.java
浏览文件 @
df1c73b7
...
...
@@ -8,9 +8,9 @@ import java.util.List;
public
interface
PrivilegeRepository
extends
PagingAndSortingRepository
<
Privilege
,
Long
>
{
List
<
Privilege
>
findByAppId
(
lo
ng
appId
);
List
<
Privilege
>
findByAppId
(
Stri
ng
appId
);
List
<
Privilege
>
findByAppIdAndPrivilType
(
lo
ng
appId
,
String
privilType
);
List
<
Privilege
>
findByAppIdAndPrivilType
(
Stri
ng
appId
,
String
privilType
);
Privilege
findByAppIdAndNameAndPrivilType
(
lo
ng
appId
,
String
name
,
String
privilType
);
Privilege
findByAppIdAndNameAndPrivilType
(
Stri
ng
appId
,
String
name
,
String
privilType
);
}
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/AppService.java
浏览文件 @
df1c73b7
...
...
@@ -16,7 +16,7 @@ public class AppService {
@Autowired
private
AppRepository
appRepository
;
public
App
detail
(
lo
ng
appId
)
{
public
App
detail
(
Stri
ng
appId
)
{
return
appRepository
.
findByAppId
(
appId
);
}
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/ConfigService.java
浏览文件 @
df1c73b7
...
...
@@ -24,6 +24,7 @@ import com.ctrip.apollo.portal.constants.PortalConstants;
import
com.ctrip.apollo.portal.entity.AppConfigVO
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.common.base.Strings
;
import
com.google.common.collect.Maps
;
@Service
...
...
@@ -40,8 +41,9 @@ public class ConfigService {
private
ObjectMapper
objectMapper
=
new
ObjectMapper
();
public
AppConfigVO
loadReleaseConfig
(
Env
env
,
long
appId
,
long
versionId
)
{
if
(
appId
<=
0
||
versionId
<=
0
)
{
public
AppConfigVO
loadReleaseConfig
(
Env
env
,
String
appId
,
long
versionId
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
||
versionId
<=
0
)
{
return
null
;
}
...
...
@@ -78,18 +80,18 @@ public class ConfigService {
return
version
.
getReleaseId
();
}
private
void
collectDefaultClusterConfigs
(
lo
ng
appId
,
ReleaseSnapshotDTO
snapShot
,
private
void
collectDefaultClusterConfigs
(
Stri
ng
appId
,
ReleaseSnapshotDTO
snapShot
,
AppConfigVO
appConfigVO
)
{
Map
<
Lo
ng
,
List
<
ConfigItemDTO
>>
groupedConfigs
=
groupConfigsByApp
(
snapShot
.
getConfigurations
());
Map
<
Stri
ng
,
List
<
ConfigItemDTO
>>
groupedConfigs
=
groupConfigsByApp
(
snapShot
.
getConfigurations
());
List
<
AppConfigVO
.
OverrideAppConfig
>
overrideAppConfigs
=
appConfigVO
.
getOverrideAppConfigs
();
for
(
Map
.
Entry
<
Lo
ng
,
List
<
ConfigItemDTO
>>
entry
:
groupedConfigs
.
entrySet
())
{
lo
ng
configAppId
=
entry
.
getKey
();
for
(
Map
.
Entry
<
Stri
ng
,
List
<
ConfigItemDTO
>>
entry
:
groupedConfigs
.
entrySet
())
{
Stri
ng
configAppId
=
entry
.
getKey
();
List
<
ConfigItemDTO
>
kvs
=
entry
.
getValue
();
if
(
configAppId
==
appId
)
{
if
(
configAppId
.
equals
(
appId
)
)
{
appConfigVO
.
setDefaultClusterConfigs
(
kvs
);
}
else
{
...
...
@@ -105,12 +107,12 @@ public class ConfigService {
/**
* appId -> List<KV>
*/
private
Map
<
Lo
ng
,
List
<
ConfigItemDTO
>>
groupConfigsByApp
(
String
configJson
)
{
private
Map
<
Stri
ng
,
List
<
ConfigItemDTO
>>
groupConfigsByApp
(
String
configJson
)
{
if
(
configJson
==
null
||
""
.
equals
(
configJson
))
{
return
Maps
.
newHashMap
();
}
Map
<
Lo
ng
,
List
<
ConfigItemDTO
>>
appIdMapKVs
=
new
HashMap
<>();
Map
<
Stri
ng
,
List
<
ConfigItemDTO
>>
appIdMapKVs
=
new
HashMap
<>();
String
key
;
Object
value
;
...
...
@@ -124,7 +126,7 @@ public class ConfigService {
key
=
entry
.
getKey
();
value
=
entry
.
getValue
();
Lo
ng
appId
=
getAppIdFromKey
(
key
);
Stri
ng
appId
=
getAppIdFromKey
(
key
);
List
<
ConfigItemDTO
>
kvs
=
appIdMapKVs
.
get
(
appId
);
if
(
kvs
==
null
)
{
kvs
=
new
LinkedList
<>();
...
...
@@ -137,11 +139,11 @@ public class ConfigService {
}
private
Lo
ng
getAppIdFromKey
(
String
key
)
{
return
Long
.
valueOf
(
key
.
substring
(
0
,
key
.
indexOf
(
"."
)
));
private
Stri
ng
getAppIdFromKey
(
String
key
)
{
return
key
.
substring
(
0
,
key
.
indexOf
(
"."
));
}
private
void
collectSpecialClusterConfigs
(
lo
ng
appId
,
ReleaseSnapshotDTO
snapShot
,
private
void
collectSpecialClusterConfigs
(
Stri
ng
appId
,
ReleaseSnapshotDTO
snapShot
,
AppConfigVO
appConfigVO
)
{
List
<
AppConfigVO
.
OverrideClusterConfig
>
overrideClusterConfigs
=
appConfigVO
.
getOverrideClusterConfigs
();
...
...
@@ -153,8 +155,8 @@ public class ConfigService {
overrideClusterConfigs
.
add
(
overrideClusterConfig
);
}
public
AppConfigVO
loadLatestConfig
(
Env
env
,
lo
ng
appId
)
{
if
(
appId
<=
0
)
{
public
AppConfigVO
loadLatestConfig
(
Env
env
,
Stri
ng
appId
)
{
if
(
Strings
.
isNullOrEmpty
(
appId
)
)
{
return
null
;
}
...
...
@@ -173,7 +175,7 @@ public class ConfigService {
return
buildAPPConfigVO
(
appId
,
Arrays
.
asList
(
configItems
));
}
private
AppConfigVO
buildAPPConfigVO
(
lo
ng
appId
,
List
<
ConfigItemDTO
>
configItems
)
{
private
AppConfigVO
buildAPPConfigVO
(
Stri
ng
appId
,
List
<
ConfigItemDTO
>
configItems
)
{
if
(
configItems
==
null
||
configItems
.
size
()
==
0
)
{
return
null
;
}
...
...
@@ -206,7 +208,7 @@ public class ConfigService {
private
void
groupConfigByAppAndEnrichDTO
(
Map
<
String
,
List
<
ConfigItemDTO
>>
groupedClusterConfigs
,
AppConfigVO
appConfigVO
)
{
lo
ng
appId
=
appConfigVO
.
getAppId
();
Stri
ng
appId
=
appConfigVO
.
getAppId
();
List
<
ConfigItemDTO
>
defaultClusterConfigs
=
appConfigVO
.
getDefaultClusterConfigs
();
...
...
@@ -232,14 +234,14 @@ public class ConfigService {
}
}
private
void
collectDefaultClusterConfigs
(
lo
ng
appId
,
List
<
ConfigItemDTO
>
clusterConfigs
,
private
void
collectDefaultClusterConfigs
(
Stri
ng
appId
,
List
<
ConfigItemDTO
>
clusterConfigs
,
List
<
ConfigItemDTO
>
defaultClusterConfigs
,
List
<
AppConfigVO
.
OverrideAppConfig
>
overrideAppConfigs
)
{
Map
<
Lo
ng
,
AppConfigVO
.
OverrideAppConfig
>
appIdMapOverrideAppConfig
=
null
;
Map
<
Stri
ng
,
AppConfigVO
.
OverrideAppConfig
>
appIdMapOverrideAppConfig
=
null
;
for
(
ConfigItemDTO
config
:
clusterConfigs
)
{
lo
ng
targetAppId
=
config
.
getAppId
();
Stri
ng
targetAppId
=
config
.
getAppId
();
if
(
appId
==
targetAppId
)
{
// app self's configs
defaultClusterConfigs
.
add
(
config
);
}
else
{
// override other app configs
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/PrivilegeService.java
浏览文件 @
df1c73b7
...
...
@@ -19,7 +19,7 @@ public class PrivilegeService {
@Autowired
private
PrivilegeRepository
privilRepo
;
public
Privilege
addPrivilege
(
lo
ng
appId
,
String
name
,
PrivilType
privilType
)
{
public
Privilege
addPrivilege
(
Stri
ng
appId
,
String
name
,
PrivilType
privilType
)
{
Privilege
privil
=
privilRepo
.
findByAppIdAndNameAndPrivilType
(
appId
,
name
,
privilType
.
name
());
if
(
privil
==
null
)
{
privil
=
new
Privilege
();
...
...
@@ -31,16 +31,16 @@ public class PrivilegeService {
return
privil
;
}
public
boolean
hasPrivilege
(
lo
ng
appId
,
String
name
,
PrivilType
privilType
)
{
public
boolean
hasPrivilege
(
Stri
ng
appId
,
String
name
,
PrivilType
privilType
)
{
Privilege
privil
=
privilRepo
.
findByAppIdAndNameAndPrivilType
(
appId
,
name
,
privilType
.
name
());
return
(
privil
!=
null
)
?
true
:
false
;
}
public
List
<
Privilege
>
listPrivileges
(
lo
ng
appId
)
{
public
List
<
Privilege
>
listPrivileges
(
Stri
ng
appId
)
{
return
privilRepo
.
findByAppId
(
appId
);
}
public
void
removePrivilege
(
lo
ng
appId
,
String
name
,
PrivilType
privilType
)
{
public
void
removePrivilege
(
Stri
ng
appId
,
String
name
,
PrivilType
privilType
)
{
Privilege
privil
=
privilRepo
.
findByAppIdAndNameAndPrivilType
(
appId
,
name
,
privilType
.
name
());
if
(
privil
==
null
)
{
throw
new
NotFoundException
();
...
...
apollo-portal/src/main/java/com/ctrip/apollo/portal/service/VersionService.java
浏览文件 @
df1c73b7
...
...
@@ -17,7 +17,7 @@ public class VersionService {
@Autowired
private
AdminServiceAPI
.
VersionAPI
versionAPI
;
public
List
<
VersionDTO
>
findVersionsByApp
(
Apollo
.
Env
env
,
lo
ng
appId
)
{
public
List
<
VersionDTO
>
findVersionsByApp
(
Apollo
.
Env
env
,
Stri
ng
appId
)
{
VersionDTO
[]
versions
=
versionAPI
.
getVersionsByApp
(
env
,
appId
);
if
(
versions
==
null
||
versions
.
length
==
0
){
...
...
apollo-portal/src/test/java/com/ctrip/apollo/portal/controller/AppControllerTest.java
浏览文件 @
df1c73b7
...
...
@@ -32,7 +32,7 @@ public class AppControllerTest extends AbstractPortalTest {
@Test
public
void
testCreate
()
throws
URISyntaxException
{
App
newApp
=
new
App
();
newApp
.
setAppId
(
S
ystem
.
currentTimeMillis
(
));
newApp
.
setAppId
(
S
tring
.
valueOf
(
System
.
currentTimeMillis
()
));
newApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
newApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
...
...
@@ -51,7 +51,7 @@ public class AppControllerTest extends AbstractPortalTest {
@Test
public
void
testList
()
throws
URISyntaxException
{
App
newApp
=
new
App
();
newApp
.
setAppId
(
S
ystem
.
currentTimeMillis
(
));
newApp
.
setAppId
(
S
tring
.
valueOf
(
System
.
currentTimeMillis
()
));
newApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
newApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
appRepository
.
save
(
newApp
);
...
...
@@ -66,7 +66,7 @@ public class AppControllerTest extends AbstractPortalTest {
@Test
public
void
testListOutOfRange
()
throws
URISyntaxException
{
App
newApp
=
new
App
();
newApp
.
setAppId
(
S
ystem
.
currentTimeMillis
(
));
newApp
.
setAppId
(
S
tring
.
valueOf
(
System
.
currentTimeMillis
()
));
newApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
newApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
appRepository
.
save
(
newApp
);
...
...
apollo-portal/src/test/java/com/ctrip/apollo/portal/repository/AppRepositoryTest.java
浏览文件 @
df1c73b7
...
...
@@ -18,7 +18,7 @@ public class AppRepositoryTest extends AbstractPortalTest {
Assert
.
assertEquals
(
0
,
repository
.
count
());
App
ramdomApp
=
new
App
();
ramdomApp
.
setAppId
(
S
ystem
.
currentTimeMillis
(
));
ramdomApp
.
setAppId
(
S
tring
.
valueOf
(
System
.
currentTimeMillis
()
));
ramdomApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
ramdomApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
repository
.
save
(
ramdomApp
);
...
...
apollo-portal/src/test/java/com/ctrip/apollo/portal/service/ConfigServiceTest.java
浏览文件 @
df1c73b7
...
...
@@ -3,7 +3,6 @@ package com.ctrip.apollo.portal.service;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
...
...
@@ -63,7 +62,7 @@ public class ConfigServiceTest {
@Test
public
void
testLoadReleaseConfig
()
{
long
appId
=
6666
;
String
appId
=
"6666"
;
long
versionId
=
100
;
long
releaseId
=
11111
;
...
...
@@ -84,7 +83,7 @@ public class ConfigServiceTest {
@Test
public
void
testLoadReleaseConfigOnlyDefaultConfigs
()
{
long
appId
=
6666
;
String
appId
=
"6666"
;
long
versionId
=
100
;
long
releaseId
=
11111
;
...
...
@@ -107,7 +106,7 @@ public class ConfigServiceTest {
@Test
public
void
testLoadReleaseConfigDefaultConfigsAndOverrideApp
()
{
long
appId
=
6666
;
String
appId
=
"6666"
;
long
versionId
=
100
;
long
releaseId
=
11111
;
VersionDTO
someVersion
=
assembleVersion
(
appId
,
"1.0"
,
releaseId
);
...
...
@@ -129,7 +128,7 @@ public class ConfigServiceTest {
@Test
public
void
testLoadReleaseConfigDefaultConfigsAndOverrideCluster
()
{
long
appId
=
6666
;
String
appId
=
"6666"
;
long
versionId
=
100
;
long
releaseId
=
11111
;
VersionDTO
someVersion
=
assembleVersion
(
appId
,
"1.0"
,
releaseId
);
...
...
@@ -153,7 +152,7 @@ public class ConfigServiceTest {
@Test
public
void
testLoadLastestConfig
()
{
long
appId
=
6666
;
String
appId
=
"6666"
;
ClusterDTO
[]
someClusters
=
assembleClusters
();
ConfigItemDTO
[]
someConfigItem
=
assembleConfigItems
();
...
...
@@ -163,14 +162,14 @@ public class ConfigServiceTest {
AppConfigVO
appConfigVO
=
configService
.
loadLatestConfig
(
Env
.
DEV
,
appId
);
assertEquals
(
appConfigVO
.
getAppId
(),
6666
);
assertEquals
(
appConfigVO
.
getAppId
(),
"6666"
);
assertEquals
(
appConfigVO
.
getVersionId
(),
PortalConstants
.
LASTEST_VERSION_ID
);
assertEquals
(
appConfigVO
.
getDefaultClusterConfigs
().
size
(),
3
);
assertEquals
(
appConfigVO
.
getOverrideAppConfigs
().
size
(),
1
);
assertEquals
(
appConfigVO
.
getOverrideClusterConfigs
().
size
(),
1
);
}
private
VersionDTO
assembleVersion
(
lo
ng
appId
,
String
versionName
,
long
releaseId
)
{
private
VersionDTO
assembleVersion
(
Stri
ng
appId
,
String
versionName
,
long
releaseId
)
{
VersionDTO
version
=
new
VersionDTO
();
version
.
setAppId
(
appId
);
version
.
setName
(
versionName
);
...
...
@@ -198,12 +197,12 @@ public class ConfigServiceTest {
private
ClusterDTO
[]
assembleClusters
()
{
ClusterDTO
[]
clusters
=
new
ClusterDTO
[
2
];
clusters
[
0
]
=
assembleCluster
(
100
,
6666
,
Constants
.
DEFAULT_CLUSTER_NAME
);
clusters
[
1
]
=
assembleCluster
(
101
,
6666
,
"cluster1"
);
clusters
[
0
]
=
assembleCluster
(
100
,
"6666"
,
Constants
.
DEFAULT_CLUSTER_NAME
);
clusters
[
1
]
=
assembleCluster
(
101
,
"6666"
,
"cluster1"
);
return
clusters
;
}
private
ClusterDTO
assembleCluster
(
long
id
,
lo
ng
appId
,
String
name
)
{
private
ClusterDTO
assembleCluster
(
long
id
,
Stri
ng
appId
,
String
name
)
{
ClusterDTO
cluster
=
new
ClusterDTO
();
cluster
.
setAppId
(
appId
);
cluster
.
setId
(
id
);
...
...
@@ -213,19 +212,15 @@ public class ConfigServiceTest {
private
ConfigItemDTO
[]
assembleConfigItems
()
{
ConfigItemDTO
[]
configItems
=
new
ConfigItemDTO
[
5
];
configItems
[
0
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
6666
,
"6666.k1"
,
"6666.v1"
);
configItems
[
1
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
6666
,
"6666.k2"
,
"6666.v2"
);
configItems
[
2
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
6666
,
"6666.k3"
,
"6666.v3"
);
configItems
[
3
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
5555
,
"5555.k1"
,
"5555.v1"
);
configItems
[
4
]
=
assembleConfigItem
(
101
,
"cluster1"
,
6666
,
"6666.k1"
,
"6666.v1"
);
configItems
[
0
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
"6666"
,
"6666.k1"
,
"6666.v1"
);
configItems
[
1
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
"6666"
,
"6666.k2"
,
"6666.v2"
);
configItems
[
2
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
"6666"
,
"6666.k3"
,
"6666.v3"
);
configItems
[
3
]
=
assembleConfigItem
(
100
,
Constants
.
DEFAULT_CLUSTER_NAME
,
"5555"
,
"5555.k1"
,
"5555.v1"
);
configItems
[
4
]
=
assembleConfigItem
(
101
,
"cluster1"
,
"6666"
,
"6666.k1"
,
"6666.v1"
);
return
configItems
;
}
private
ConfigItemDTO
assembleConfigItem
(
long
clusterId
,
String
clusterName
,
int
appId
,
private
ConfigItemDTO
assembleConfigItem
(
long
clusterId
,
String
clusterName
,
String
appId
,
String
key
,
String
value
)
{
ConfigItemDTO
configItem
=
new
ConfigItemDTO
();
configItem
.
setClusterName
(
clusterName
);
...
...
apollo-portal/src/test/java/com/ctrip/apollo/portal/service/PrivilegeServiceTest.java
浏览文件 @
df1c73b7
...
...
@@ -21,7 +21,7 @@ public class PrivilegeServiceTest extends AbstractPortalTest {
@Test
public
void
testAddAndRemovePrivilege
()
{
App
newApp
=
new
App
();
newApp
.
setAppId
((
System
.
currentTimeMillis
()));
newApp
.
setAppId
(
String
.
valueOf
(
System
.
currentTimeMillis
()));
newApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
newApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
appService
.
save
(
newApp
);
...
...
@@ -42,7 +42,7 @@ public class PrivilegeServiceTest extends AbstractPortalTest {
@Test
public
void
testCheckPrivilege
()
{
App
newApp
=
new
App
();
newApp
.
setAppId
((
System
.
currentTimeMillis
()));
newApp
.
setAppId
(
String
.
valueOf
(
System
.
currentTimeMillis
()));
newApp
.
setName
(
"new app "
+
System
.
currentTimeMillis
());
newApp
.
setOwner
(
"owner "
+
System
.
currentTimeMillis
());
appService
.
save
(
newApp
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录