Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wrr-cat
apollo
提交
d327f070
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,发现更多精彩内容 >>
提交
d327f070
编写于
3月 10, 2017
作者:
J
Jason Song
提交者:
GitHub
3月 10, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #565 from lepdou/lock
bugfix: still lock branch when master modified
上级
573b1183
c08abef5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
15 deletion
+35
-15
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspect.java
...mework/apollo/adminservice/aop/NamespaceUnlockAspect.java
+4
-3
apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspectTest.java
...rk/apollo/adminservice/aop/NamespaceUnlockAspectTest.java
+31
-12
未找到文件。
apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspect.java
浏览文件 @
d327f070
...
@@ -133,9 +133,10 @@ public class NamespaceUnlockAspect {
...
@@ -133,9 +133,10 @@ public class NamespaceUnlockAspect {
if
(
parentNamespace
==
null
)
{
if
(
parentNamespace
==
null
)
{
generateMapFromItems
(
namespaceItems
,
configurationFromItems
);
generateMapFromItems
(
namespaceItems
,
configurationFromItems
);
}
else
{
//child namespace
}
else
{
//child namespace
List
<
Item
>
parentItems
=
itemService
.
findItems
(
parentNamespace
.
getId
());
Release
parentRelease
=
releaseService
.
findLatestActiveRelease
(
parentNamespace
);
if
(
parentRelease
!=
null
)
{
generateMapFromItems
(
parentItems
,
configurationFromItems
);
configurationFromItems
=
gson
.
fromJson
(
parentRelease
.
getConfigurations
(),
GsonType
.
CONFIG
);
}
generateMapFromItems
(
namespaceItems
,
configurationFromItems
);
generateMapFromItems
(
namespaceItems
,
configurationFromItems
);
}
}
...
...
apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/aop/NamespaceUnlockAspectTest.java
浏览文件 @
d327f070
...
@@ -103,18 +103,18 @@ public class NamespaceUnlockAspectTest {
...
@@ -103,18 +103,18 @@ public class NamespaceUnlockAspectTest {
public
void
testChildNamespaceModified
()
{
public
void
testChildNamespaceModified
()
{
long
childNamespaceId
=
1
,
parentNamespaceId
=
2
;
long
childNamespaceId
=
1
,
parentNamespaceId
=
2
;
Namespace
childNamespace
=
createNamespace
(
childNamespaceId
);
Namespace
childNamespace
=
createNamespace
(
childNamespaceId
);
Namespace
parentNamespace
=
createNamespace
(
child
NamespaceId
);
Namespace
parentNamespace
=
createNamespace
(
parent
NamespaceId
);
Release
childRelease
=
createRelease
(
"{\"k1\":\"v1\", \"k2\":\"v2\"}"
);
Release
childRelease
=
createRelease
(
"{\"k1\":\"v1\", \"k2\":\"v2\"}"
);
List
<
Item
>
childItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v3"
));
List
<
Item
>
childItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v3"
));
List
<
Item
>
parentItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v1"
),
createItem
(
"k2"
,
"v2"
)
);
Release
parentRelease
=
createRelease
(
"{\"k1\":\"v1\", \"k2\":\"v2\"}"
);
when
(
releaseService
.
findLatestActiveRelease
(
childNamespace
)).
thenReturn
(
childRelease
);
when
(
releaseService
.
findLatestActiveRelease
(
childNamespace
)).
thenReturn
(
childRelease
);
when
(
releaseService
.
findLatestActiveRelease
(
parentNamespace
)).
thenReturn
(
parentRelease
);
when
(
itemService
.
findItems
(
childNamespaceId
)).
thenReturn
(
childItems
);
when
(
itemService
.
findItems
(
childNamespaceId
)).
thenReturn
(
childItems
);
when
(
itemService
.
findItems
(
parentNamespaceId
)).
thenReturn
(
parentItems
);
when
(
namespaceService
.
findParentNamespace
(
childNamespace
)).
thenReturn
(
parentNamespace
);
when
(
namespaceService
.
findParentNamespace
(
parentNamespace
)).
thenReturn
(
parentNamespace
);
boolean
isModified
=
namespaceUnlockAspect
.
isModified
(
parent
Namespace
);
boolean
isModified
=
namespaceUnlockAspect
.
isModified
(
child
Namespace
);
Assert
.
assertTrue
(
isModified
);
Assert
.
assertTrue
(
isModified
);
}
}
...
@@ -123,18 +123,37 @@ public class NamespaceUnlockAspectTest {
...
@@ -123,18 +123,37 @@ public class NamespaceUnlockAspectTest {
public
void
testChildNamespaceNotModified
()
{
public
void
testChildNamespaceNotModified
()
{
long
childNamespaceId
=
1
,
parentNamespaceId
=
2
;
long
childNamespaceId
=
1
,
parentNamespaceId
=
2
;
Namespace
childNamespace
=
createNamespace
(
childNamespaceId
);
Namespace
childNamespace
=
createNamespace
(
childNamespaceId
);
Namespace
parentNamespace
=
createNamespace
(
child
NamespaceId
);
Namespace
parentNamespace
=
createNamespace
(
parent
NamespaceId
);
Release
childRelease
=
createRelease
(
"{\"k1\":\"v1\", \"k2\":\"v2\"}"
);
Release
childRelease
=
createRelease
(
"{\"k1\":\"v3\", \"k2\":\"v2\"}"
);
List
<
Item
>
childItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v1"
));
List
<
Item
>
childItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v3"
));
List
<
Item
>
parentItems
=
Arrays
.
asList
(
createItem
(
"k2"
,
"v2"
));
Release
parentRelease
=
createRelease
(
"{\"k1\":\"v1\", \"k2\":\"v2\"}"
);
when
(
releaseService
.
findLatestActiveRelease
(
childNamespace
)).
thenReturn
(
childRelease
);
when
(
releaseService
.
findLatestActiveRelease
(
parentNamespace
)).
thenReturn
(
parentRelease
);
when
(
itemService
.
findItems
(
childNamespaceId
)).
thenReturn
(
childItems
);
when
(
namespaceService
.
findParentNamespace
(
childNamespace
)).
thenReturn
(
parentNamespace
);
boolean
isModified
=
namespaceUnlockAspect
.
isModified
(
childNamespace
);
Assert
.
assertFalse
(
isModified
);
}
@Test
public
void
testParentNamespaceNotReleased
()
{
long
childNamespaceId
=
1
,
parentNamespaceId
=
2
;
Namespace
childNamespace
=
createNamespace
(
childNamespaceId
);
Namespace
parentNamespace
=
createNamespace
(
parentNamespaceId
);
Release
childRelease
=
createRelease
(
"{\"k1\":\"v3\", \"k2\":\"v2\"}"
);
List
<
Item
>
childItems
=
Arrays
.
asList
(
createItem
(
"k1"
,
"v2"
),
createItem
(
"k2"
,
"v2"
));
when
(
releaseService
.
findLatestActiveRelease
(
childNamespace
)).
thenReturn
(
childRelease
);
when
(
releaseService
.
findLatestActiveRelease
(
childNamespace
)).
thenReturn
(
childRelease
);
when
(
releaseService
.
findLatestActiveRelease
(
parentNamespace
)).
thenReturn
(
null
);
when
(
itemService
.
findItems
(
childNamespaceId
)).
thenReturn
(
childItems
);
when
(
itemService
.
findItems
(
childNamespaceId
)).
thenReturn
(
childItems
);
when
(
itemService
.
findItems
(
parentNamespaceId
)).
thenReturn
(
parentItems
);
when
(
namespaceService
.
findParentNamespace
(
childNamespace
)).
thenReturn
(
parentNamespace
);
when
(
namespaceService
.
findParentNamespace
(
parentNamespace
)).
thenReturn
(
parentNamespace
);
boolean
isModified
=
namespaceUnlockAspect
.
isModified
(
parent
Namespace
);
boolean
isModified
=
namespaceUnlockAspect
.
isModified
(
child
Namespace
);
Assert
.
assertTrue
(
isModified
);
Assert
.
assertTrue
(
isModified
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录