fix golint issues, else blocks (#457)

rest/handler/contentsecurityhandler_test.go

@@ -315,12 +315,13 @@ func buildRequest(rs requestSettings) (*http.Request, error) {
 		var path string
 		var query string
 		if len(rs.requestUri) > 0 {
-			if u, err := url.Parse(rs.requestUri); err != nil {
+			u, err := url.Parse(rs.requestUri)
+			if err != nil {
 				return nil, err
-			} else {
-				path = u.Path
-				query = u.RawQuery
 			}
+
+			path = u.Path
+			query = u.RawQuery
 		} else {
 			path = r.URL.Path
 			query = r.URL.RawQuery
@@ -377,10 +378,9 @@ func createTempFile(body []byte) (string, error) {
 	tmpFile, err := ioutil.TempFile(os.TempDir(), "go-unit-*.tmp")
 	if err != nil {
 		return "", err
-	} else {
-		tmpFile.Close()
 	}
 
+	tmpFile.Close()
 	err = ioutil.WriteFile(tmpFile.Name(), body, os.ModePerm)
 	if err != nil {
 		return "", err

rest/handler/loghandler.go

@@ -114,9 +114,9 @@ func dumpRequest(r *http.Request) string {
 	reqContent, err := httputil.DumpRequest(r, true)
 	if err != nil {
 		return err.Error()
-	} else {
-		return string(reqContent)
 	}
+
+	return string(reqContent)
 }
 
 func logBrief(r *http.Request, code int, timer *utils.ElapsedTimer, logs *internal.LogCollector) {

rest/handler/sheddinghandler_test.go

@@ -89,9 +89,9 @@ type mockShedder struct {
 func (s mockShedder) Allow() (load.Promise, error) {
 	if s.allow {
 		return mockPromise{}, nil
-	} else {
-		return nil, load.ErrServiceOverloaded
 	}
+
+	return nil, load.ErrServiceOverloaded
 }
 
 type mockPromise struct {