Use opportunities to unindent code (unindent)

This commit fixes the following unindent findings:
pkg/api/common.go:102:2: "if x { if y" should be "if x && y"
pkg/components/dynmap/dynmap.go:642:2: invert condition and early return
pkg/components/dynmap/dynmap.go:681:2: invert condition and early return
pkg/components/simplejson/simplejson.go:171:2: "if x { if y" should be "if x && y"
pkg/middleware/dashboard_redirect.go:42:3: invert condition and early return
pkg/tsdb/mssql/mssql.go:301:3: invert condition and early break
pkg/tsdb/mysql/mysql.go:312:3: invert condition and early break
pkg/tsdb/postgres/postgres.go:292:3: invert condition and early break
pkg/tsdb/sql_engine.go:144:2: invert condition and early return
This commit is contained in:
Karsten Weiss
2018-04-28 10:53:16 +02:00
parent c5419ba885
commit 893a91af3a
8 changed files with 125 additions and 132 deletions
+25 -31
View File
@@ -639,26 +639,24 @@ func (v *Value) Object() (*Object, error) {
valid = true
}
if !valid {
return nil, ErrNotObject
}
obj := new(Object)
obj.valid = valid
m := make(map[string]*Value)
if valid {
obj := new(Object)
obj.valid = valid
m := make(map[string]*Value)
if valid {
for key, element := range v.data.(map[string]interface{}) {
m[key] = &Value{element, true}
}
for key, element := range v.data.(map[string]interface{}) {
m[key] = &Value{element, true}
}
obj.data = v.data
obj.m = m
return obj, nil
}
return nil, ErrNotObject
obj.data = v.data
obj.m = m
return obj, nil
}
// Attempts to typecast the current value into an object arrau.
@@ -678,23 +676,19 @@ func (v *Value) ObjectArray() ([]*Object, error) {
// Unsure if this is a good way to use slices, it's probably not
var slice []*Object
if valid {
for _, element := range v.data.([]interface{}) {
childValue := Value{element, true}
childObject, err := childValue.Object()
if err != nil {
return nil, ErrNotObjectArray
}
slice = append(slice, childObject)
}
return slice, nil
if !valid {
return nil, ErrNotObjectArray
}
for _, element := range v.data.([]interface{}) {
childValue := Value{element, true}
childObject, err := childValue.Object()
return nil, ErrNotObjectArray
if err != nil {
return nil, ErrNotObjectArray
}
slice = append(slice, childObject)
}
return slice, nil
}
// Attempts to typecast the current value into a string.