Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
81e7900d
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,发现更多精彩内容 >>
提交
81e7900d
编写于
7月 28, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update
上级
83ae4032
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
42 addition
and
34 deletion
+42
-34
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/Change.java
...a/com/ctrip/framework/apollo/portal/entity/vo/Change.java
+31
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/ReleaseCompareResult.java
...amework/apollo/portal/entity/vo/ReleaseCompareResult.java
+2
-31
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/enums/ChangeType.java
...a/com/ctrip/framework/apollo/portal/enums/ChangeType.java
+5
-0
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java
...ctrip/framework/apollo/portal/service/ReleaseService.java
+4
-3
未找到文件。
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/Change.java
0 → 100644
浏览文件 @
81e7900d
package
com.ctrip.framework.apollo.portal.entity.vo
;
import
com.ctrip.framework.apollo.portal.enums.ChangeType
;
public
class
Change
{
private
ChangeType
type
;
private
EntityPair
<
KVEntity
>
entity
;
public
Change
(
ChangeType
type
,
EntityPair
<
KVEntity
>
entity
)
{
this
.
type
=
type
;
this
.
entity
=
entity
;
}
public
ChangeType
getType
()
{
return
type
;
}
public
void
setType
(
ChangeType
type
)
{
this
.
type
=
type
;
}
public
EntityPair
<
KVEntity
>
getEntity
()
{
return
entity
;
}
public
void
setEntity
(
EntityPair
<
KVEntity
>
entity
)
{
this
.
entity
=
entity
;
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/ReleaseCompareResult.java
浏览文件 @
81e7900d
package
com.ctrip.framework.apollo.portal.entity.vo
;
import
com.ctrip.framework.apollo.portal.enums.ChangeType
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -19,35 +21,4 @@ public class ReleaseCompareResult {
this
.
changes
=
changes
;
}
public
class
Change
{
private
ChangeType
type
;
private
EntityPair
<
KVEntity
>
entity
;
public
Change
(
ChangeType
type
,
EntityPair
<
KVEntity
>
entity
)
{
this
.
type
=
type
;
this
.
entity
=
entity
;
}
public
ChangeType
getType
()
{
return
type
;
}
public
void
setType
(
ChangeType
type
)
{
this
.
type
=
type
;
}
public
EntityPair
<
KVEntity
>
getEntity
()
{
return
entity
;
}
public
void
setEntity
(
EntityPair
<
KVEntity
>
entity
)
{
this
.
entity
=
entity
;
}
}
public
enum
ChangeType
{
ADD
,
MODIFY
,
DELETE
}
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/enums/ChangeType.java
0 → 100644
浏览文件 @
81e7900d
package
com.ctrip.framework.apollo.portal.enums
;
public
enum
ChangeType
{
ADD
,
MODIFY
,
DELETE
}
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ReleaseService.java
浏览文件 @
81e7900d
...
...
@@ -12,6 +12,7 @@ import com.ctrip.framework.apollo.portal.entity.form.NamespaceReleaseModel;
import
com.ctrip.framework.apollo.portal.entity.vo.KVEntity
;
import
com.ctrip.framework.apollo.portal.entity.vo.ReleaseCompareResult
;
import
com.ctrip.framework.apollo.portal.entity.vo.ReleaseVO
;
import
com.ctrip.framework.apollo.portal.enums.ChangeType
;
import
com.dianping.cat.Cat
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -100,10 +101,10 @@ public class ReleaseService {
String
secondValue
=
secondItems
.
get
(
key
);
//added
if
(
secondValue
==
null
)
{
compareResult
.
addEntityPair
(
ReleaseCompareResult
.
ChangeType
.
DELETE
,
new
KVEntity
(
key
,
firstValue
),
compareResult
.
addEntityPair
(
ChangeType
.
DELETE
,
new
KVEntity
(
key
,
firstValue
),
new
KVEntity
(
key
,
secondValue
));
}
else
if
(!
Objects
.
equal
(
firstValue
,
secondValue
))
{
compareResult
.
addEntityPair
(
ReleaseCompareResult
.
ChangeType
.
MODIFY
,
new
KVEntity
(
key
,
firstValue
),
compareResult
.
addEntityPair
(
ChangeType
.
MODIFY
,
new
KVEntity
(
key
,
firstValue
),
new
KVEntity
(
key
,
secondValue
));
}
...
...
@@ -115,7 +116,7 @@ public class ReleaseService {
String
value
=
entry
.
getValue
();
if
(
firstItems
.
get
(
key
)
==
null
)
{
compareResult
.
addEntityPair
(
ReleaseCompareResult
.
ChangeType
.
ADD
,
new
KVEntity
(
key
,
""
),
new
KVEntity
(
key
,
value
));
.
addEntityPair
(
ChangeType
.
ADD
,
new
KVEntity
(
key
,
""
),
new
KVEntity
(
key
,
value
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录