Revert "Opportunities to unindent code (unindent)"

pkg/api/common.go

@@ -99,9 +99,11 @@ func Error(status int, message string, err error) *NormalResponse {
 		data["message"] = message
 		data["message"] = message
 	}
 	}
 
 
-	if err != nil && setting.Env != setting.PROD {
+	if err != nil {
+		if setting.Env != setting.PROD {
 			data["error"] = err.Error()
 			data["error"] = err.Error()
 		}
 		}
+	}
 
 
 	resp := JSON(status, data)
 	resp := JSON(status, data)
 
 

pkg/components/dynmap/dynmap.go

@@ -639,9 +639,7 @@ func (v *Value) Object() (*Object, error) {
 		valid = true
 		valid = true
 	}
 	}
 
 
-	if !valid {
-		return nil, ErrNotObject
-	}
+	if valid {
 		obj := new(Object)
 		obj := new(Object)
 		obj.valid = valid
 		obj.valid = valid
 
 
@@ -650,6 +648,7 @@ func (v *Value) Object() (*Object, error) {
 		if valid {
 		if valid {
 			for key, element := range v.data.(map[string]interface{}) {
 			for key, element := range v.data.(map[string]interface{}) {
 				m[key] = &Value{element, true}
 				m[key] = &Value{element, true}
+
 			}
 			}
 		}
 		}
 
 
@@ -657,6 +656,9 @@ func (v *Value) Object() (*Object, error) {
 		obj.m = m
 		obj.m = m
 
 
 		return obj, nil
 		return obj, nil
+	}
+
+	return nil, ErrNotObject
 }
 }
 
 
 // Attempts to typecast the current value into an object arrau.
 // Attempts to typecast the current value into an object arrau.
@@ -676,9 +678,8 @@ func (v *Value) ObjectArray() ([]*Object, error) {
 	// Unsure if this is a good way to use slices, it's probably not
 	// Unsure if this is a good way to use slices, it's probably not
 	var slice []*Object
 	var slice []*Object
 
 
-	if !valid {
-		return nil, ErrNotObjectArray
-	}
+	if valid {
+
 		for _, element := range v.data.([]interface{}) {
 		for _, element := range v.data.([]interface{}) {
 			childValue := Value{element, true}
 			childValue := Value{element, true}
 			childObject, err := childValue.Object()
 			childObject, err := childValue.Object()
@@ -688,7 +689,12 @@ func (v *Value) ObjectArray() ([]*Object, error) {
 			}
 			}
 			slice = append(slice, childObject)
 			slice = append(slice, childObject)
 		}
 		}
+
 		return slice, nil
 		return slice, nil
+	}
+
+	return nil, ErrNotObjectArray
+
 }
 }
 
 
 // Attempts to typecast the current value into a string.
 // Attempts to typecast the current value into a string.

pkg/components/simplejson/simplejson.go

@@ -168,9 +168,11 @@ func (j *Json) GetPath(branch ...string) *Json {
 //    js.Get("top_level").Get("array").GetIndex(1).Get("key").Int()
 //    js.Get("top_level").Get("array").GetIndex(1).Get("key").Int()
 func (j *Json) GetIndex(index int) *Json {
 func (j *Json) GetIndex(index int) *Json {
 	a, err := j.Array()
 	a, err := j.Array()
-	if err == nil && len(a) > index {
+	if err == nil {
+		if len(a) > index {
 			return &Json{a[index]}
 			return &Json{a[index]}
 		}
 		}
+	}
 	return &Json{nil}
 	return &Json{nil}
 }
 }
 
 

pkg/middleware/dashboard_redirect.go

@@ -24,12 +24,12 @@ func RedirectFromLegacyDashboardURL() macaron.Handler {
 	return func(c *m.ReqContext) {
 	return func(c *m.ReqContext) {
 		slug := c.Params("slug")
 		slug := c.Params("slug")
 
 
-		if slug == "" {
-			return
-		}
+		if slug != "" {
 			if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
 			if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
 				url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
 				url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
 				c.Redirect(url, 301)
 				c.Redirect(url, 301)
+				return
+			}
 		}
 		}
 	}
 	}
 }
 }
@@ -39,16 +39,17 @@ func RedirectFromLegacyDashboardSoloURL() macaron.Handler {
 		slug := c.Params("slug")
 		slug := c.Params("slug")
 		renderRequest := c.QueryBool("render")
 		renderRequest := c.QueryBool("render")
 
 
-		if slug == "" {
-			return
-		}
+		if slug != "" {
 			if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
 			if url, err := getDashboardURLBySlug(c.OrgId, slug); err == nil {
 				if renderRequest && strings.Contains(url, setting.AppSubUrl) {
 				if renderRequest && strings.Contains(url, setting.AppSubUrl) {
 					url = strings.Replace(url, setting.AppSubUrl, "", 1)
 					url = strings.Replace(url, setting.AppSubUrl, "", 1)
 				}
 				}
+
 				url = strings.Replace(url, "/d/", "/d-solo/", 1)
 				url = strings.Replace(url, "/d/", "/d-solo/", 1)
 				url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
 				url = fmt.Sprintf("%s?%s", url, c.Req.URL.RawQuery)
 				c.Redirect(url, 301)
 				c.Redirect(url, 301)
+				return
+			}
 		}
 		}
 	}
 	}
 }
 }

pkg/tsdb/mssql/mssql.go

@@ -298,9 +298,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
 		key := elem.Value.(string)
 		key := elem.Value.(string)
 		result.Series = append(result.Series, pointsBySeries[key])
 		result.Series = append(result.Series, pointsBySeries[key])
 
 
-		if !fillMissing {
-			break
-		}
+		if fillMissing {
 			series := pointsBySeries[key]
 			series := pointsBySeries[key]
 			// fill in values from last fetched value till interval end
 			// fill in values from last fetched value till interval end
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
@@ -313,6 +311,7 @@ func (e MssqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
 				rowCount++
 				rowCount++
 			}
 			}
 		}
 		}
+	}
 
 
 	result.Meta.Set("rowCount", rowCount)
 	result.Meta.Set("rowCount", rowCount)
 	return nil
 	return nil

pkg/tsdb/mysql/mysql.go

@@ -309,9 +309,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
 		key := elem.Value.(string)
 		key := elem.Value.(string)
 		result.Series = append(result.Series, pointsBySeries[key])
 		result.Series = append(result.Series, pointsBySeries[key])
 
 
-		if !fillMissing {
-			break
-		}
+		if fillMissing {
 			series := pointsBySeries[key]
 			series := pointsBySeries[key]
 			// fill in values from last fetched value till interval end
 			// fill in values from last fetched value till interval end
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
@@ -324,6 +322,7 @@ func (e MysqlQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *core.
 				rowCount++
 				rowCount++
 			}
 			}
 		}
 		}
+	}
 
 
 	result.Meta.Set("rowCount", rowCount)
 	result.Meta.Set("rowCount", rowCount)
 	return nil
 	return nil

pkg/tsdb/postgres/postgres.go

@@ -289,9 +289,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
 		key := elem.Value.(string)
 		key := elem.Value.(string)
 		result.Series = append(result.Series, pointsBySeries[key])
 		result.Series = append(result.Series, pointsBySeries[key])
 
 
-		if !fillMissing {
-			break
-		}
+		if fillMissing {
 			series := pointsBySeries[key]
 			series := pointsBySeries[key]
 			// fill in values from last fetched value till interval end
 			// fill in values from last fetched value till interval end
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
 			intervalStart := series.Points[len(series.Points)-1][1].Float64
@@ -304,6 +302,7 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
 				rowCount++
 				rowCount++
 			}
 			}
 		}
 		}
+	}
 
 
 	result.Meta.Set("rowCount", rowCount)
 	result.Meta.Set("rowCount", rowCount)
 	return nil
 	return nil

pkg/tsdb/sql_engine.go

@@ -141,9 +141,7 @@ func (e *DefaultSqlEngine) Query(
 // ConvertSqlTimeColumnToEpochMs converts column named time to unix timestamp in milliseconds
 // ConvertSqlTimeColumnToEpochMs converts column named time to unix timestamp in milliseconds
 // to make native datetime types and epoch dates work in annotation and table queries.
 // to make native datetime types and epoch dates work in annotation and table queries.
 func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) {
 func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) {
-	if timeIndex < 0 {
-		return
-	}
+	if timeIndex >= 0 {
 		switch value := values[timeIndex].(type) {
 		switch value := values[timeIndex].(type) {
 		case time.Time:
 		case time.Time:
 			values[timeIndex] = EpochPrecisionToMs(float64(value.UnixNano()))
 			values[timeIndex] = EpochPrecisionToMs(float64(value.UnixNano()))
@@ -188,6 +186,7 @@ func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) {
 				values[timeIndex] = EpochPrecisionToMs(float64(*value))
 				values[timeIndex] = EpochPrecisionToMs(float64(*value))
 			}
 			}
 		}
 		}
+	}
 }
 }
 
 
 // ConvertSqlValueColumnToFloat converts timeseries value column to float.
 // ConvertSqlValueColumnToFloat converts timeseries value column to float.