summaryrefslogtreecommitdiffstats
path: root/model/cluster_info.go
diff options
context:
space:
mode:
Diffstat (limited to 'model/cluster_info.go')
-rw-r--r--model/cluster_info.go26
1 files changed, 7 insertions, 19 deletions
diff --git a/model/cluster_info.go b/model/cluster_info.go
index c4f7e89a6..a8d63ec32 100644
--- a/model/cluster_info.go
+++ b/model/cluster_info.go
@@ -18,12 +18,8 @@ type ClusterInfo struct {
}
func (me *ClusterInfo) ToJson() string {
- b, err := json.Marshal(me)
- if err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(me)
+ return string(b)
}
func (me *ClusterInfo) Copy() *ClusterInfo {
@@ -32,22 +28,14 @@ func (me *ClusterInfo) Copy() *ClusterInfo {
}
func ClusterInfoFromJson(data io.Reader) *ClusterInfo {
- decoder := json.NewDecoder(data)
- var me ClusterInfo
- err := decoder.Decode(&me)
- if err == nil {
- return &me
- } else {
- return nil
- }
+ var me *ClusterInfo
+ json.NewDecoder(data).Decode(&me)
+ return me
}
func ClusterInfosToJson(objmap []*ClusterInfo) string {
- if b, err := json.Marshal(objmap); err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(objmap)
+ return string(b)
}
func ClusterInfosFromJson(data io.Reader) []*ClusterInfo {